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

Trivial merge