Merge branch 'upstream/wm8974' into for-2.6.33
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 30 Sep 2009 14:48:38 +0000 (15:48 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Wed, 30 Sep 2009 14:48:38 +0000 (15:48 +0100)

Trivial merge