git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 367b005 1bf15b3 931cb5a)

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	2d8a92784ca13458c89311f088949e44221ee340
tree	41e6c0003218b5a2075a3f09f781bf345029096e	tree \| snapshot
parent	367b0057747861b3492dba4ed58e27e7e0fcba7c	commit \| diff
parent	1bf15b3a99f677d70fa8d3139b281d88b1006e1c	commit \| diff
parent	931cb5a4fee834da1941553bb5dcb2f16f945761	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 Source Tree.