Merge branch 'linus' into core/generic-dma-coherent
authorIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 19:13:20 +0000 (21:13 +0200)
committerIngo Molnar <mingo@elte.hu>
Fri, 18 Jul 2008 19:13:20 +0000 (21:13 +0200)
commitf6dc8ccaab6d8f63cbae1e6c73fe972b26f5376c
treec5643fcdc884a8d0bfc3f1bc28039cab7394e5bc
parent323ec001c6bb98eeabb5abbdbb8c8055d9496554
parent5b664cb235e97afbf34db9c4d77f08ebd725335e
Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

kernel/Makefile

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/Kconfig
arch/x86/kernel/pci-dma.c
kernel/Makefile