Merge branch 'for-rmk/cacheflush-v2' of git://git.kernel.org/pub/scm/linux/kernel...

author Russell King <rmk+kernel@arm.linux.org.uk>

Wed, 28 Aug 2013 17:38:40 +0000 (18:38 +0100)

committer Russell King <rmk+kernel@arm.linux.org.uk>

Wed, 28 Aug 2013 17:38:40 +0000 (18:38 +0100)
author Russell King <rmk+kernel@arm.linux.org.uk>
Wed, 28 Aug 2013 17:38:40 +0000 (18:38 +0100)
committer Russell King <rmk+kernel@arm.linux.org.uk>
Wed, 28 Aug 2013 17:38:40 +0000 (18:38 +0100)
diff --cc arch/arm/include/asm/cacheflush.h
Simple merge
diff --cc arch/arm/include/asm/thread_info.h
Simple merge
diff --cc arch/arm/kernel/traps.c
Simple merge
author	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 28 Aug 2013 17:38:40 +0000 (18:38 +0100)
committer	Russell King <rmk+kernel@arm.linux.org.uk>
	Wed, 28 Aug 2013 17:38:40 +0000 (18:38 +0100)
		1	2
arch/arm/include/asm/cacheflush.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/thread_info.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/kernel/traps.c	patch \|	diff1 \|	diff2 \|	blob \| history