Merge branch 'for-2.6.35' into for-2.6.36
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Jul 2010 19:12:57 +0000 (20:12 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 14 Jul 2010 19:12:57 +0000 (20:12 +0100)

Trivial merge