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

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 9 Dec 2013 23:26:07 +0000 (23:26 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Mon, 9 Dec 2013 23:26:07 +0000 (23:26 +0000)
commit	f464ce8ba7ef76c6d974eff397ffcea384444ada
tree	9987f2aa2c0101eeb3c64e309b4b4f34070feace	tree \| snapshot
parent	3f02ff5c2c69753666787ed125708d283a823ffb	commit \| diff
parent	5303c0f46c8708fff4148ebcc491f78710356952	commit \| diff
parent	b31459adeab018b297541e288ac88873011da82a	commit \| diff
parent	d12b4c7fba7374d3dd582417c059745962d6576f	commit \| diff
parent	dd78b639f3d5ab60779f79a136c20725b88c9d40	commit \| diff

Merge branches 'amba', 'fixes', 'kees' and 'misc' into for-next

arch/arm/include/asm/pgtable.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/kernel/setup.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/kernel/traps.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-omap2/omap4-common.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mm/dma-mapping.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history