Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Fri, 9 May 2008 22:24:09 +0000 (23:24 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 9 May 2008 22:24:09 +0000 (23:24 +0100)

Trivial merge