]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 Jan 2011 22:55:21 +0000 (22:55 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 3 Jan 2011 22:55:21 +0000 (22:55 +0000)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge