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

Trivial merge