Merge branch 'stmp' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 14 Jun 2009 10:01:05 +0000 (11:01 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 14 Jun 2009 10:01:05 +0000 (11:01 +0100)
commit06099961002a813324d057a91695af7c72939da6
treed55ee7a8833c95ee2afb6914bb8a2977cbb9fa31
parent4c31791c3d9d38ac052dd5e2981df713d8f3dcc4
parentc11c22177ae2929598051a39e4655be4a42cb805
Merge branch 'stmp' into devel
arch/arm/Kconfig
arch/arm/Makefile