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

author	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 15 Jan 2014 13:58:22 +0000 (13:58 +0000)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 15 Jan 2014 13:58:22 +0000 (13:58 +0000)
commit	e4d2ec14bfc55baf8a6f20e065896444f1806bbf
tree	92dcfbc9b1c06356ed21fc2395dbcacf52cead9b	tree \| snapshot
parent	5303c0f46c8708fff4148ebcc491f78710356952	commit \| diff
parent	b25f3e1c358434bf850220e04f28eebfc45eb634	commit \| diff
parent	71b55663c5d0a6f8473045db1c8b376803780191	commit \| diff
parent	0b29ab29381581f25ffbeffdb389a927896608e5	commit \| diff
parent	162e68c08c916d0b701331a85291537fed2ad537	commit \| diff

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

arch/arm/Kconfig.debug	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/include/asm/pgtable.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/kernel/traps.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-footbridge/dc21285-timer.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
arch/arm/mach-highbank/highbank.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