git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3ee0fc5 497b7e9)

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 8 Dec 2011 18:02:04 +0000 (18:02 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Thu, 8 Dec 2011 18:02:04 +0000 (18:02 +0000)
commit	6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d
tree	41d04269f268d6162e5f1866496dd42fbc79d2a4	tree \| snapshot
parent	3ee0fc5ca129cbae81c073756febcb1c552af446	commit \| diff
parent	497b7e943d0dc5743454de56dcdb67352bbf96b2	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/pgtable.h	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/head.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/ioremap.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules