Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 9 Apr 2011 02:33:45 +0000 (11:33 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 9 Apr 2011 02:33:45 +0000 (11:33 +0900)

Trivial merge