Merge branch 's3c2410' of git://aeryn.fluff.org.uk/bjdooks/linux.git
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 26 Aug 2008 22:16:39 +0000 (23:16 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 26 Aug 2008 22:16:45 +0000 (23:16 +0100)
commit9abc6461a3802702ada88cbac1fed045dbd9b466
tree5d377876a0fb5249902912fd4d1b71a10ba9907b
parentf8787fdcf6f46d6a65a42dbddb70cd7e4dc5b741
parent78af47353065ea776d537f6e8b32c7c15b6ea169
Merge branch 's3c2410' of git://aeryn.fluff.org.uk/bjdooks/linux.git