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)

Trivial merge