Merge branch 'for-2.6.29' into for-2.6.30
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Feb 2009 21:37:01 +0000 (21:37 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 10 Feb 2009 21:37:01 +0000 (21:37 +0000)

Trivial merge