]> Git Repo - linux.git/commitdiff
Merge commit 'v2.6.27-rc3' into x86/prototypes
authorIngo Molnar <[email protected]>
Thu, 14 Aug 2008 10:19:59 +0000 (12:19 +0200)
committerIngo Molnar <[email protected]>
Thu, 14 Aug 2008 10:19:59 +0000 (12:19 +0200)
Conflicts:

include/asm-x86/dma-mapping.h

Signed-off-by: Ingo Molnar <[email protected]>
13 files changed:
1  2 
arch/x86/kernel/ldt.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/signal_32.c
arch/x86/kernel/signal_64.c
arch/x86/kernel/smpboot.c
arch/x86/mm/ioremap.c
include/asm-x86/hw_irq.h
include/asm-x86/i387.h
include/asm-x86/io_64.h
include/asm-x86/pgtable.h
include/asm-x86/pgtable_32.h
include/asm-x86/processor.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
This page took 0.095203 seconds and 4 git commands to generate.