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

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b2139aa 30a2f3c)

author	Ingo Molnar <mingo@elte.hu>
	Thu, 14 Aug 2008 10:19:59 +0000 (12:19 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Thu, 14 Aug 2008 10:19:59 +0000 (12:19 +0200)
commit	8d7ccaa545490cdffdfaff0842436a8dd85cf47b
tree	8129b5907161bc6ae26deb3645ce1e280c5e1f51	tree \| snapshot
parent	b2139aa0eec330c711c5a279db361e5ef1178e78	commit \| diff
parent	30a2f3c60a84092c8084dfe788b710f8d0768cd4	commit \| diff

Merge commit 'v2.6.27-rc3' into x86/prototypes

Conflicts:

include/asm-x86/dma-mapping.h

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

13 files changed:

arch/x86/kernel/ldt.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/signal_32.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/ioremap.c	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_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

Making Linux better for my computers