tree d827bca3fc825a0ac33efbcd493713be40fcc812
parent cf7a2b4fb6a9b86779930a0a123b0df41aa9208f
parent f17a1f06d2fa93f4825be572622eb02c4894db4e
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1252753346 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1252753346 +0100

Merge branch 'devel-stable' into devel

Conflicts:
	MAINTAINERS
	arch/arm/mm/fault.c