Merge branch 'linus' into x86/gart
authorIngo Molnar <mingo@elte.hu>
Fri, 15 Aug 2008 16:15:17 +0000 (18:15 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 15 Aug 2008 16:15:17 +0000 (18:15 +0200)
commitf3efbe582b5396d134024c03a5fa253f2a85d9a6
treee4e15b7567b82d24cb1e7327398286a2b88df04c
parent05d3ed0a1fe3ea05ab9f3b8d32576a0bc2e19660
parentb635acec48bcaa9183fcbf4e3955616b0d4119b5
Merge branch 'linus' into x86/gart
arch/x86/kernel/pci-gart_64.c