Merge branch 'topic/pcm-internal' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Feb 2012 10:43:48 +0000 (10:43 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 9 Feb 2012 10:43:48 +0000 (10:43 +0000)

Trivial merge