Merge branch 'topic/adsp' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Nov 2012 17:45:57 +0000 (17:45 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 28 Nov 2012 17:45:57 +0000 (17:45 +0000)

Trivial merge