tree 0952c90cd49704a9172e985ca491d79b60c40bc8
parent b31fc7af78e17b0203e1cd5a195c590e8adeae0d
parent 08458ef6eede6cf7d5a33c3a7c8bcdc3943012c2
author Russell King <rmk+kernel@arm.linux.org.uk> 1280582402 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1280582402 +0100

Merge branch 'misc' into devel

Conflicts:
	arch/arm/mm/init.c