Merge branch 'wm8961' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Jun 2009 10:08:26 +0000 (11:08 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Jun 2009 10:08:26 +0000 (11:08 +0100)

Trivial merge