Merge branch 'for-2.6.33' into for-2.6.34
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 5 Feb 2010 12:43:50 +0000 (12:43 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 5 Feb 2010 12:43:50 +0000 (12:43 +0000)

Trivial merge