]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 17 Nov 2008 10:45:03 +0000 (10:45 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 Nov 2008 10:45:03 +0000 (10:45 +0000)

Trivial merge