pilppa.com Git - linux-2.6-omap-h63xx.git/commit

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

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b6d4f7e f934fb1)

author	Ingo Molnar <mingo@elte.hu>
	Mon, 28 Jul 2008 22:07:55 +0000 (00:07 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 28 Jul 2008 22:07:55 +0000 (00:07 +0200)
commit	cb28a1bbdb4790378e7366d6c9ee1d2340b84f92
tree	316436f77dac75335fd2c3ef5f109e71606c50d3	tree \| snapshot
parent	b6d4f7e3ef25beb8c658c97867d98883e69dc544	commit \| diff
parent	f934fb19ef34730263e6afc01e8ec27a8a71470f	commit \| diff

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.