Merge branch 'for-2.6.32' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 23 Sep 2009 17:54:06 +0000 (10:54 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 23 Sep 2009 17:54:06 +0000 (10:54 -0700)

Trivial merge