xenbits.xensource.com Git - people/ssmith/netchannel2-pvops.bak.git/.git/commit

]> xenbits.xensource.com Git - people/ssmith/netchannel2-pvops.bak.git/.git/commit

projects / people / ssmith / netchannel2-pvops.bak.git / .git / commit

author	Ingo Molnar <mingo@elte.hu>
	Tue, 12 May 2009 07:26:58 +0000 (09:26 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Tue, 12 May 2009 07:26:58 +0000 (09:26 +0200)
commit	390a77aa87b28bd932ee92a80260ddcb3f8efe0c
tree	cfd87f286e8d714aaaf0a7e1efd2a236312cbbb8	tree
parent	f7a32471ae0a8feefabccdf51b674021aee760ca	commit \| diff
parent	6f2ae5cea38b03c0911fd7a3e2ee5ddc02740a47	commit \| diff

Merge branch 'auto-perfcounters-next' into auto-latest

Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c

21 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/oprofile/nmi_int.c	diff1 \|	diff2 \|	blob \| history
include/linux/init_task.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/mutex.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
kernel/timer.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file to name it for gitweb.

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/hw_irq.h	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/irq_vectors.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/common.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/entry_64.S	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/irq.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/traps.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/oprofile/nmi_int.c	diff1 \|	diff2 \|	blob \| history
include/linux/init_task.h	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/mutex.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	diff1 \|	diff2 \|	blob \| history
kernel/timer.c	diff1 \|	diff2 \|	blob \| history