]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'for-rmk-fixes' of git://git.infradead.org/users/cbou/linux-cns3xxx
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 6 Dec 2010 15:39:23 +0000 (15:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 6 Dec 2010 15:39:23 +0000 (15:39 +0000)

Trivial merge