Merge branch 'for-3.0' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 09:38:23 +0000 (10:38 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 6 Jun 2011 09:38:23 +0000 (10:38 +0100)

Trivial merge