Merge branch 'eseries' into pxa
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Jul 2008 20:43:36 +0000 (21:43 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Jul 2008 20:43:36 +0000 (21:43 +0100)
Conflicts:

arch/arm/mach-pxa/Makefile


Trivial merge