Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 2 Oct 2009 21:31:04 +0000 (22:31 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 2 Oct 2009 21:31:04 +0000 (22:31 +0100)
Conflicts:
MAINTAINERS


Trivial merge