Merge branch 'linus' into x86/cleanups
authorIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 10:57:01 +0000 (12:57 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 10:57:01 +0000 (12:57 +0200)
1  2 
arch/x86/kernel/pci-dma.c
arch/x86/mm/init_64.c

Simple merge
Simple merge