Merge branch 'for-2.6.36' into for-2.6.37
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 7 Oct 2010 20:44:20 +0000 (13:44 -0700)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Thu, 7 Oct 2010 20:44:20 +0000 (13:44 -0700)

Trivial merge