Merge branch 'for-2.6.36' into for-2.6.37
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 25 Sep 2010 08:15:39 +0000 (09:15 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 25 Sep 2010 08:15:39 +0000 (09:15 +0100)

Trivial merge