Merge branch 'pxa' into devel
commit0181b61a988424b5cc44fe09e6968142359c815e
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 15 Oct 2007 17:55:44 +0000 (15 18:55 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Oct 2007 17:56:02 +0000 (15 18:56 +0100)
tree2575ee900a39ffaa169ad5aeb8aa6ddee11cfbe5
parent92633b72d18ca4f25de1f28e436a882159491e7e
parent87944f3361fc033b73617aa663135c6e468957a7
Merge branch 'pxa' into devel
arch/arm/Kconfig