tree d5746250f994bad7c32c2853e1cc89c9181e1c88
parent 3eadd3b21cec340dacdc24dd1f9735344290ca62
parent 49fb88af23f3344ba53d6dbe34ac0b1426d81006
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1245677517 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1245677517 +0100

Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel