]> err.no Git - linux-2.6/commitdiff
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)
1  2 
arch/x86/kernel/pci-dma.c

Simple merge