git.oblomov.eu Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 19268ed 8d7ccaa)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 6 Oct 2008 14:18:26 +0000 (16:18 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 6 Oct 2008 16:06:53 +0000 (18:06 +0200)
commit	0962f402af1bb0b53ccee626785d202a10c12fff
tree	26fa57193f16e45c6e0557049d02164f129077ed	tree \| snapshot
parent	19268ed7449c561694d048a34601a30e2d1aaf79	commit \| diff
parent	8d7ccaa545490cdffdfaff0842436a8dd85cf47b	commit \| diff

Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1

Conflicts:
arch/x86/kernel/process_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

26 files changed:

arch/x86/kernel/cpu/mtrr/main.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/ptrace.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/signal_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/smpboot.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/init_32.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/ioremap.c	diff1 \|	diff2 \|	blob \| history
include/asm-x86/apic.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/e820.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/hw_irq.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/i387.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/io_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/page_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/page_64.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/pgtable_32.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/processor.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/ptrace.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/setup.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/signal.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/smp.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/time.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/timer.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/traps.h	diff1 \|	diff2 \|	blob \| history

Making Linux better for my computers