git.stricted.de - GitHub/LineageOS/android_kernel_samsung

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

author	Ingo Molnar <mingo@elte.hu>
	Thu, 11 Jun 2009 15:55:42 +0000 (17:55 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 11 Jun 2009 15:55:42 +0000 (17:55 +0200)
commit	940010c5a314a7bd9b498593bc6ba1718ac5aec5
tree	d141e08ced08c40c6a8e3ab2cdecde5ff14e560f	tree \| snapshot (tar.gz zip)
parent	8dc8e5e8bc0ce00b0f656bf972f67cd8a72759e5	commit \| diff
parent	991ec02cdca33b03a132a0cacfe6f0aa0be9aa8d	commit \| diff

Merge branch 'linus' into perfcounters/core

Conflicts:
arch/x86/kernel/irqinit.c
arch/x86/kernel/irqinit_64.c
arch/x86/kernel/traps.c
arch/x86/mm/fault.c
include/linux/sched.h
kernel/exit.c

22 files changed:

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/irqinit.c	\|	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
arch/x86/vdso/vma.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

RSS Atom

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/irqinit.c	\|	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
arch/x86/vdso/vma.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