Merge remote branch 'broonie-asoc/for-2.6.37' into for-2.6.37
authorLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 20 Sep 2010 08:49:26 +0000 (09:49 +0100)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 20 Sep 2010 08:49:26 +0000 (09:49 +0100)

Trivial merge