]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'sh/runtime-pm-misery' into sh-fixes-for-linus
authorPaul Mundt <lethal@linux-sh.org>
Tue, 31 May 2011 07:00:58 +0000 (16:00 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 31 May 2011 07:00:58 +0000 (16:00 +0900)

Trivial merge