Merge branch 'for-2.6.33' into for-2.6.34
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 4 Dec 2009 10:50:02 +0000 (10:50 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 4 Dec 2009 10:50:02 +0000 (10:50 +0000)

Trivial merge