Merge branch 'devel-stable' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Sep 2009 11:02:26 +0000 (12:02 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Sep 2009 11:02:26 +0000 (12:02 +0100)
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c


Trivial merge