Merge commit 'a5479e389e989acfeca9c32eeb0083d086202280' into for-2.6.32
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 11 Aug 2009 12:09:27 +0000 (13:09 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 11 Aug 2009 12:09:27 +0000 (13:09 +0100)

Trivial merge