]> err.no Git - linux-2.6/commit
Merge branch 'linus' into core/generic-dma-coherent
authorIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 22:07:55 +0000 (00:07 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 22:07:55 +0000 (00:07 +0200)
commitcb28a1bbdb4790378e7366d6c9ee1d2340b84f92
tree316436f77dac75335fd2c3ef5f109e71606c50d3
parentb6d4f7e3ef25beb8c658c97867d98883e69dc544
parentf934fb19ef34730263e6afc01e8ec27a8a71470f
Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/arm/Kconfig
arch/sh/Kconfig
arch/sh/mm/consistent.c
arch/x86/Kconfig
arch/x86/kernel/pci-dma.c
include/asm-arm/dma-mapping.h
include/asm-cris/dma-mapping.h
include/asm-sh/dma-mapping.h
include/asm-x86/dma-mapping.h
init/Kconfig
kernel/Makefile