Merge branch 'for-2.6.40' into for-2.6.41
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 30 May 2011 02:54:18 +0000 (10:54 +0800)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 30 May 2011 02:54:18 +0000 (10:54 +0800)

Trivial merge