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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 88b023a 7bd0b0f)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Dec 2011 04:01:47 +0000 (15:01 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 12 Dec 2011 04:01:47 +0000 (15:01 +1100)
commit	90e0e46880dbf39147c5e4d0bf774d5395ff4946
tree	c6e479089857cdd7e048a098c4c1173b717c73be	tree \| snapshot
parent	88b023a67030912e25c4c097468120f4a72323af	commit \| diff
parent	7bd0b0f0da3b1ec11cbcc798eb0ef747a1184077	commit \| diff

Merge remote-tracking branch 'memblock/memblock-kill-early_node_map'

Conflicts:
arch/arm/mm/init.c
arch/score/Kconfig

30 files changed:

arch/arm/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/ia64/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/mem.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/numa.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/tlb_nohash.c	diff1 \|	diff2 \|	blob \| history
arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/s390/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/score/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sh/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sparc/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/e820.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/e820.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/mpparse.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/numa.c	diff1 \|	diff2 \|	blob \| history
arch/x86/platform/efi/efi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/setup.c	diff1 \|	diff2 \|	blob \| history
drivers/iommu/intel-iommu.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
kernel/printk.c	diff1 \|	diff2 \|	blob \| history
mm/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules