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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 79403cd e5b61de 6c5c2a0)

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 14 Apr 2015 21:28:25 +0000 (22:28 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Tue, 14 Apr 2015 21:28:25 +0000 (22:28 +0100)
commit	c848791f0336914a3081ea3fe029cf177d81de81
tree	41e6c0003218b5a2075a3f09f781bf345029096e	tree \| snapshot
parent	79403cda37204b06b9f96351a35251ff7d88de4b	commit \| diff
parent	e5b61deb3af465f11db7e5e11944ba00a33ece1f	commit \| diff
parent	6c5c2a01fcfdb70f2e95e30e96ccf53b88e81023	commit \| diff

Merge branches 'misc', 'vdso' and 'fixes' into for-next

Conflicts:
arch/arm/mm/proc-macros.S

arch/arm/Makefile	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/include/asm/elf.h	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/kernel/Makefile	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/kernel/process.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mm/Kconfig	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mm/cache-l2x0.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mm/proc-arm940.S	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mm/proc-arm946.S	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/arm/mm/proc-macros.S	diff1 \|	diff2 \|	diff3 \|	blob \| history

Linux kernel for KaRo TX COM modules