Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37
authorLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 23 Aug 2010 11:58:01 +0000 (12:58 +0100)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 23 Aug 2010 11:58:01 +0000 (12:58 +0100)

Trivial merge