]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Mar 2011 08:42:55 +0000 (08:42 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Mar 2011 08:42:55 +0000 (08:42 +0000)

Trivial merge