git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f4d1712 6e42ac2)

author	Ingo Molnar <mingo@elte.hu>
	Sun, 12 Oct 2008 10:35:23 +0000 (12:35 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 12 Oct 2008 10:37:32 +0000 (12:37 +0200)
commit	9259f82070e72402a7dcf1cb49365c48356e1aaa
tree	9397d1304144a288411f2118707f44ff5e862fa6	tree \| snapshot
parent	f4d171223b0d2cb0daaaa9bcb7ff7384405c528c	commit \| diff
parent	6e42ac2e0be8d41a79b271628b2ee664ddeb9534	commit \| diff

Merge branch 'linus' into x86/xen

Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c

17 files changed:

arch/x86/kernel/Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/ldt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/paravirt.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/process_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/xen/enlighten.c	diff1 \|	diff2 \|	blob \| history
drivers/block/xen-blkfront.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/desc.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/paravirt.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/smp.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/spinlock.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/tlbflush.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/xen/hypervisor.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.