summaryrefslogtreecommitdiffstats
path: root/drivers/ata/pata_opti.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-12-23 01:23:44 +0100
committerMark Brown <broonie@kernel.org>2015-12-23 01:23:44 +0100
commit9451a469280adb721e3eca5eb3526c3331c2847d (patch)
tree6ea96fe14aba5a02859de824870c11359dbb3521 /drivers/ata/pata_opti.c
parentMerge remote-tracking branches 'asoc/topic/fsl-spdif', 'asoc/topic/img' and '... (diff)
parentASoC: core: Pass kcontrol to bytes tlv callbacks (diff)
parentASoC: max98357a: Add ACPI ID for Maxim (diff)
parentASoC: mediatek: Turn AFE on/off in runtime resume/suspend (diff)
downloadlinux-9451a469280adb721e3eca5eb3526c3331c2847d.tar.xz
linux-9451a469280adb721e3eca5eb3526c3331c2847d.zip
Merge remote-tracking branches 'asoc/topic/kcontrol', 'asoc/topic/max98357a' and 'asoc/topic/mtk' into asoc-next