Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37
authorLiam Girdwood <lrg@slimlogic.co.uk>
Wed, 18 Aug 2010 13:05:39 +0000 (14:05 +0100)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Wed, 18 Aug 2010 13:05:39 +0000 (14:05 +0100)

Trivial merge