tree 41d04269f268d6162e5f1866496dd42fbc79d2a4
parent 3ee0fc5ca129cbae81c073756febcb1c552af446
parent 497b7e943d0dc5743454de56dcdb67352bbf96b2
author Russell King <rmk+kernel@arm.linux.org.uk> 1323367324 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1323367324 +0000

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable

Conflicts:
	arch/arm/mm/ioremap.c