Merge branch 'for-2.6.35' into for-2.6.36
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 17 Jul 2010 18:45:43 +0000 (19:45 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 17 Jul 2010 18:45:43 +0000 (19:45 +0100)

Trivial merge