]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branches 'sh/clkfwk' and 'sh/kexec'
authorPaul Mundt <lethal@linux-sh.org>
Tue, 11 May 2010 02:53:11 +0000 (11:53 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 11 May 2010 02:53:11 +0000 (11:53 +0900)

Trivial merge