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)
commit538f0fd0f210c2ce5c585799f18d0e5c7cf6155e
treee9fa2b10ce5d92ac6bcd8ac55af1cd97bda3ec5d
parent3bb6fbf9969a8bbe4892968659239273d092e78a
parentf26a3988917913b3d11b2bd741601a2c64ab9204
Merge branch 'linus' into x86/gart
arch/x86/kernel/pci-dma.c