tree ba6562cb63297c126016d02dd214a9dca5652cf4
parent ef449e6d21b6e560c7ec36ed285ec3a34e0b12ed
parent 1264fa6f8c5bf561a86128b2d48ace53e3f1e66f
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1236376385 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1236376385 +0000

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