Merge branch 'linus' into x86/gart
authorIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:27:18 +0000 (11:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:27:18 +0000 (11:27 +0200)
commit33ee375b2ea5dd11581a57d67bedd0ca39b19a5e
tree411d3a04936e281e54680ad082f98d985561bce5
parent6703f6d10dcd3316e03641a5ecaa6c8a04374d98
parent066519068ad2fbe98c7f45552b1f592903a9c8c8
Merge branch 'linus' into x86/gart
arch/x86/kernel/pci-dma.c