tree b9904286faba7f57e8c1a4da6206cc6a255a9dd3
parent 77f4025b5e7b290f5c3cc03aa6242328694c71d4
parent 0c3ee078251b85812e585b5cf5d1635afd73f4e2
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1240000544 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1240000544 +0100

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