b09c869dfaabd7a9
parent a177ba3b7a08beef3f0fe74efa0f90701891945a
parent 1bd55a436f1f90de0e7f476e514e01bd67497b88
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1215704510 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1215704510 +0100

Merge branch 'imx' into devel

Conflicts:

	arch/arm/mm/Kconfig
bôiø• x