Merge branch 'for-2.6.35' into for-2.6.36
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Jul 2010 08:52:25 +0000 (09:52 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 20 Jul 2010 08:52:25 +0000 (09:52 +0100)

Trivial merge