Merge branch 'next' into for-linus
authorVinod Koul <[email protected]>
Wed, 25 May 2011 13:04:07 +0000 (18:34 +0530)
committerVinod Koul <[email protected]>
Wed, 25 May 2011 13:04:07 +0000 (18:34 +0530)

Trivial merge