tree 2575ee900a39ffaa169ad5aeb8aa6ddee11cfbe5
parent 92633b72d18ca4f25de1f28e436a882159491e7e
parent 87944f3361fc033b73617aa663135c6e468957a7
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1192470944 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1192470962 +0100

Merge branch 'pxa' into devel