www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

Merge branch 'linus' into core/generic-dma-coherent

Conflicts:

arch/x86/Kconfig

Signed-off-by: Ingo Molnar <mingo@elte.hu>

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sh/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sh/mm/consistent.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/pci-dma.c	diff1 \|	diff2 \|	blob \| history
include/asm-arm/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
include/asm-cris/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
include/asm-sh/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.

arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sh/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/sh/mm/consistent.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/pci-dma.c	diff1 \|	diff2 \|	blob \| history
include/asm-arm/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
include/asm-cris/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
include/asm-sh/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
include/asm-x86/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
init/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/Makefile	diff1 \|	diff2 \|	blob \| history