Merge branch 'topic/multi-component' of git://git.kernel.org/pub/scm/linux/kernel...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 12 Aug 2010 13:40:28 +0000 (14:40 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 12 Aug 2010 13:40:28 +0000 (14:40 +0100)
commitcf7af01aa77ec1b17687f5328ce0a598709efd59
tree4cc46339721366c7498dacf5ebac01906be273e7
parent6f341d14811550d863ba804ce6ec7757a7145081
parent5dcba5d6741d4533e0ef696507f93f2a4c738efb
Merge branch 'topic/multi-component' of git://git./linux/kernel/git/lrg/asoc-2.6 into for-2.6.37
sound/soc/codecs/wm8580.c
sound/soc/s3c24xx/smdk64xx_wm8580.c