Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 19 Nov 2010 11:49:35 +0000 (11:49 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 19 Nov 2010 11:49:35 +0000 (11:49 +0000)

Trivial merge