Merge branch 'for-2.6.39' into for-2.6.40
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 29 Mar 2011 22:14:04 +0000 (07:14 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 29 Mar 2011 22:14:04 +0000 (07:14 +0900)

Trivial merge