Merge branch 'sh/runtime-pm-misery' into sh-fixes-for-linus
authorPaul Mundt <[email protected]>
Tue, 31 May 2011 07:00:58 +0000 (16:00 +0900)
committerPaul Mundt <[email protected]>
Tue, 31 May 2011 07:00:58 +0000 (16:00 +0900)

Trivial merge