53e664
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1215895431 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1215895431 +0100

Merge branch 'pxa-devel' into pxa
h�_~�