review.tizen.org Git - platform/upstream/kernel-adaptation-pc.git/commit

projects / platform / upstream / kernel-adaptation-pc.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2b583d8 3c92ec8)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 29 Dec 2008 08:45:15 +0000 (09:45 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 29 Dec 2008 08:45:15 +0000 (09:45 +0100)
commit	e1df957670aef74ffd9a4ad93e6d2c90bf6b4845
tree	bca1fcfef55b3e3e82c9a822b4ac6428fce2b419	tree \| snapshot
parent	2b583d8bc8d7105b58d7481a4a0ceb718dac49c6	commit \| diff
parent	3c92ec8ae91ecf59d88c798301833d7cf83f2179	commit \| diff

Merge branch 'linus' into perfcounters/core

Conflicts:
fs/exec.c
include/linux/init_task.h

Simple context conflicts.

18 files changed:

arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/thread_info.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/apic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/Makefile	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/signal.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/processor_idle.c	diff1 \|	diff2 \|	blob \| history
drivers/char/sysrq.c	diff1 \|	diff2 \|	blob \| history
fs/exec.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/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/sys.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Uncategorized;