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)
commit534d0c92cfc45174fbfeca2f3dd54c3ce332725e
tree6f944e0878ca6fc71a844a93aabe81c60fe5f693
parent610ea6c671685a09afff7ba521bdccda21c84c76
parentf00f510ab33f3e689e35ccdbb8dc264168aa5250
Merge branch 'fixes' of git://git./linux/kernel/git/djbw/xscaleiop

Conflicts:
MAINTAINERS
MAINTAINERS