]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 81065c4 5f606d3)
Merge commit 'v2.6.38' into x86/mm
authorIngo Molnar <mingo@elte.hu>
Tue, 15 Mar 2011 07:29:44 +0000 (08:29 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 15 Mar 2011 07:29:44 +0000 (08:29 +0100)
commit15bec630d1c0d989dc712c17b288078af175d74a
tree7e5f6d050b72ab08a4497e82a4a103fefb086e80tree | snapshot
parent81065c4ecf3db837217bde8b33bf3c590bc85e3ecommit | diff
parent5f606d388b7d90e888f8599ea3bd433cadefba0ecommit | diff
Merge commit 'v2.6.38' into x86/mm

Conflicts:
arch/x86/mm/numa_64.c

Merge reason: Resolve the conflict, update the branch to .38.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/acpi.h diff1 | diff2 | blob | history
arch/x86/include/asm/apic.h diff1 | diff2 | blob | history
arch/x86/kernel/acpi/boot.c diff1 | diff2 | blob | history
arch/x86/kernel/apic/apic.c diff1 | diff2 | blob | history
arch/x86/kernel/smpboot.c diff1 | diff2 | blob | history
arch/x86/mm/init_64.c diff1 | diff2 | blob | history
arch/x86/xen/mmu.c diff1 | diff2 | blob | history
mm/page_alloc.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.