Merge branch 'wm8974-upstream' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 15 Aug 2009 10:52:43 +0000 (11:52 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Sat, 15 Aug 2009 10:52:43 +0000 (11:52 +0100)

Trivial merge