]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge branch 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinci into...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 10 Jun 2011 07:57:14 +0000 (08:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 10 Jun 2011 07:57:14 +0000 (08:57 +0100)

Trivial merge