Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 20 Nov 2009 23:53:11 +0000 (23:53 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 20 Nov 2009 23:53:11 +0000 (23:53 +0000)

Trivial merge