aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/Makefile
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-06-05 18:55:07 +0100
committerMark Brown <broonie@kernel.org>2015-06-05 18:55:07 +0100
commit11e688862c4c8162119a4ca51c3326555966c8bb (patch)
tree8bfdf90255955696d8b687890b10daaf7852617a /sound/soc/Makefile
parentMerge remote-tracking branches 'asoc/topic/topology', 'asoc/topic/twl6040', 'asoc/topic/wm5100', 'asoc/topic/wm8741' and 'asoc/topic/wm8960' into asoc-next (diff)
parentASoC: wm8994: Pass the IRQF_ONESHOT flag (diff)
parentASoC: wm8996: Pass the IRQF_ONESHOT flag (diff)
parentASoC: zx: fix platform_no_drv_owner.cocci warnings (diff)
downloadlinux-dev-11e688862c4c8162119a4ca51c3326555966c8bb.tar.xz
linux-dev-11e688862c4c8162119a4ca51c3326555966c8bb.zip
Merge remote-tracking branches 'asoc/topic/wm8994', 'asoc/topic/wm8996' and 'asoc/topic/zx' into asoc-next