Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 14 May 2010 19:09:46 +0000 (20:09 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 14 May 2010 19:09:46 +0000 (20:09 +0100)
1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge