Merge branch 'for-2.6.29' into for-2.6.30
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 16 Jan 2009 16:40:35 +0000 (16:40 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Fri, 16 Jan 2009 16:40:35 +0000 (16:40 +0000)

Trivial merge