Merge branch 'nomadik' into devel-stable
commit701038144945ef98c5817f43079952fa38c35999
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Sep 2009 10:50:52 +0000 (12 11:50 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Sep 2009 10:50:52 +0000 (12 11:50 +0100)
tree88782f6ac8e4df1f7f8f738659adedd7108e8cae
parent4abf27add86e5b7c37dca1fb4dd9a740b4332a84
parentc2b455474e4c6bc8bab6506e2a08dbd5ad50d74d
Merge branch 'nomadik' into devel-stable
arch/arm/Kconfig
arch/arm/Makefile