Merge commit 'v2.6.37-rc1' into for-2.6.37
authorLiam Girdwood <[email protected]>
Wed, 3 Nov 2010 14:11:27 +0000 (14:11 +0000)
committerLiam Girdwood <[email protected]>
Wed, 3 Nov 2010 14:11:27 +0000 (14:11 +0000)

Trivial merge