git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 672de43 c6b1f07)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 30 Apr 2012 04:58:41 +0000 (14:58 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Mon, 30 Apr 2012 04:58:41 +0000 (14:58 +1000)
commit	abb3266104aa6a0677bee03b78e23d4b62a59498
tree	91320fa679f05f123a1d863f4e5523a85dd5581a	tree \| snapshot
parent	672de43a7b0ab3bb3b36eb0ad1a67e0973201197	commit \| diff
parent	c6b1f07c97d22fd5891cc3738194cab64656c536	commit \| diff

Merge remote-tracking branch 'dma-mapping/dma-mapping-next'

Conflicts:
arch/x86/include/asm/dma-mapping.h

12 files changed:

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
arch/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/init.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/mmu.c	diff1 \|	diff2 \|	blob \| history
arch/x86/Kconfig	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/dma-mapping.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
include/linux/mmzone.h	diff1 \|	diff2 \|	blob \| history
mm/Kconfig	diff1 \|	diff2 \|	blob \| history
mm/Makefile	diff1 \|	diff2 \|	blob \| history
mm/vmstat.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules