Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 19 Jan 2011 11:17:12 +0000 (11:17 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 19 Jan 2011 11:17:12 +0000 (11:17 +0000)

Trivial merge