Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 28 Oct 2008 09:55:45 +0000 (09:55 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 28 Oct 2008 09:55:45 +0000 (09:55 +0000)

Trivial merge