Programming Languages Research Group: Git - firefly-linux-kernel-4.4.55.git/commit

projects / firefly-linux-kernel-4.4.55.git / commit

author	Ingo Molnar <mingo@elte.hu>
	Tue, 31 Aug 2010 07:45:21 +0000 (09:45 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 31 Aug 2010 07:45:46 +0000 (09:45 +0200)
commit	daab7fc734a53fdeaf844b7c03053118ad1769da
tree	575deb3cdcc6dda562acaed6f7c29bc81ae01cf2	tree \| snapshot
parent	774ea0bcb27f57b6fd521b3b6c43237782fed4b9	commit \| diff
parent	2bfc96a127bc1cc94d26bfaa40159966064f9c8c	commit \| diff

Merge commit 'v2.6.36-rc3' into x86/memblock

Conflicts:
arch/x86/kernel/trampoline.c
mm/memblock.c

Merge reason: Resolve the conflicts, update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

21 files changed:

arch/microblaze/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/paca.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/rtas.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_32.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/fsl_booke_mmu.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/init_64.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/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/sleep.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head32.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/kernel/trampoline.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/setup.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom

arch/microblaze/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/paca.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/rtas.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_32.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/kernel/setup_64.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/fsl_booke_mmu.c	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/init_64.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/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/acpi/sleep.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/head32.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/kernel/trampoline.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/setup.c	diff1 \|	diff2 \|	blob \| history
include/linux/mm.h	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
mm/page_alloc.c	diff1 \|	diff2 \|	blob \| history