tree 9c9d265ab0c87ea7862ccb70933f33d3d7011334
parent e8b374bb6c888a70530d800c9e2fcd153e2c325d
parent 839e642f3dda44a35c6a91780bff41d84c288022
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1238109011 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1238109011 +0000

Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

Conflicts:
	arch/arm/mm/Kconfig

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>