Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Sep 2010 10:53:13 +0000 (11:53 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Sep 2010 10:53:13 +0000 (11:53 +0100)

Trivial merge