Merge branch 'for-next' into for-linus
authorLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 1 Aug 2011 17:25:06 +0000 (18:25 +0100)
committerLiam Girdwood <lrg@slimlogic.co.uk>
Mon, 1 Aug 2011 17:25:06 +0000 (18:25 +0100)

Trivial merge