tree 046edf3437a49d3f6989d152bd94fcc80906b86d
parent e81b795d44ba04beab7714de65ed2e377823bd37
parent 9b71de49b030ad8fd4d13d38571b5c42dc9ed8dd
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1248947275 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1248947275 +0100

Merge branch 's3c-fixes-rc4' of git://aeryn.fluff.org.uk/bjdooks/linux