Merge branch 'clps7500' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 27 Nov 2008 12:39:43 +0000 (12:39 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 27 Nov 2008 12:39:43 +0000 (12:39 +0000)
commit31bccbf39208133415000520c79ebe7b291786df
treee03b799594ec22613ca2eb7382fc0a98e0cd4b0f
parente902be56cbf2a48d96d11d6884767e638d41c712
parent635f0258e5ae526034486b4ae9020e64bfb7d27e
Merge branch 'clps7500' into devel

Conflicts:

arch/arm/Kconfig
arch/arm/Kconfig