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)
commit5a58d4bb66b1d68e4b9319dd5b89078bad2a7f64
tree7e3c7dd69ba19b41d11ff8f08f2906443a72a5e6
parent7fecc34e07e02b4d9dab1a1f4bf7fdac0a656b9b
parentac2536109849217a71510b6ded813e91629e88f6
Merge branch 'eseries' into pxa

Conflicts:

arch/arm/mach-pxa/Makefile
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile