Merge branch 'linus' into x86/gart
authorThomas Gleixner <tglx@linutronix.de>
Sat, 17 May 2008 15:12:24 +0000 (17:12 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Sat, 17 May 2008 15:12:24 +0000 (17:12 +0200)
1  2 
arch/x86/kernel/pci-dma.c

Simple merge