]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit65cd207bd80b3b5e623ae8f00c36e4133daf9ef6
tree41d04269f268d6162e5f1866496dd42fbc79d2a4
parentf4d8000864326dff4bdc86488a06c54d5440b82b
parent1dbfb28240d64dbd034fa92115876cac94decbd7
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
arch/arm/Kconfig
arch/arm/include/asm/pgtable.h
arch/arm/kernel/head.S
arch/arm/mm/ioremap.c
arch/arm/mm/mmu.c