aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-12 19:48:56 +0100
committerMark Brown <broonie@kernel.org>2015-04-12 19:48:56 +0100
commit41caf0564ea1a8a3b3cb572abc64d5116c150b6c (patch)
tree3aa60e41bf36aaa9bf5891ad99f3722f1ad0987c /sound
parentMerge remote-tracking branches 'asoc/topic/4554', 'asoc/topic/ab8500', 'asoc/topic/ak4642', 'asoc/topic/arizona' and 'asoc/topic/atmel' into asoc-next (diff)
parentASoC: cx20442: remove incorerct __exit markups (diff)
parentASoC: davinci-evm: Use card DAPM context to access widgets (diff)
downloadlinux-dev-41caf0564ea1a8a3b3cb572abc64d5116c150b6c.tar.xz
linux-dev-41caf0564ea1a8a3b3cb572abc64d5116c150b6c.zip
Merge remote-tracking branches 'asoc/topic/cx20442' and 'asoc/topic/davinci' into asoc-next