Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Dec 2011 18:02:04 +0000 (18:02 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 8 Dec 2011 18:02:04 +0000 (18:02 +0000)
commit6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d
tree41d04269f268d6162e5f1866496dd42fbc79d2a4
parent3ee0fc5ca129cbae81c073756febcb1c552af446
parent497b7e943d0dc5743454de56dcdb67352bbf96b2
Merge branch 'for-rmk' of git://git./linux/kernel/git/cmarinas/linux into devel-stable

Conflicts:
arch/arm/mm/ioremap.c
arch/arm/Kconfig
arch/arm/include/asm/pgtable.h
arch/arm/kernel/head.S
arch/arm/mm/ioremap.c
arch/arm/mm/mmu.c