Merge branch 'for-2.6.35' into for-2.6.36
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 2 Jun 2010 10:47:24 +0000 (11:47 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 2 Jun 2010 10:47:24 +0000 (11:47 +0100)

Trivial merge