Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 17 Aug 2009 17:16:28 +0000 (18:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 17 Aug 2009 17:16:28 +0000 (18:16 +0100)
commit29c08460d472e427cec5e5dcb12ec74c923f8250
tree9d8557fe9cf123920c3ceb023274e763e5f208b0
parent9b2616c2e8cc98ca98bbb40cad83a8d3d859e840
parentbaa28e3530375e0bef2c53243634a1c78f5c02f3
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
arch/arm/Kconfig
arch/arm/Makefile