Merge branch 'for-2.6.36' into for-2.6.37
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Sep 2010 11:03:28 +0000 (12:03 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 22 Sep 2010 11:03:28 +0000 (12:03 +0100)

Trivial merge