Merge remote-tracking branch 'lsk/v3.10/topic/thp' into linux-linaro-lsk

author Mark Brown <broonie@kernel.org>

Fri, 10 Oct 2014 18:13:56 +0000 (19:13 +0100)

committer Mark Brown <broonie@kernel.org>

Fri, 10 Oct 2014 18:13:56 +0000 (19:13 +0100)
author Mark Brown <broonie@kernel.org>
Fri, 10 Oct 2014 18:13:56 +0000 (19:13 +0100)
committer Mark Brown <broonie@kernel.org>
Fri, 10 Oct 2014 18:13:56 +0000 (19:13 +0100)
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/include/asm/pgtable.h
Simple merge
diff --cc arch/arm/include/asm/tlb.h
Simple merge
diff --cc arch/arm/mm/dma-mapping.c
Simple merge
author	Mark Brown <broonie@kernel.org>
	Fri, 10 Oct 2014 18:13:56 +0000 (19:13 +0100)
committer	Mark Brown <broonie@kernel.org>
	Fri, 10 Oct 2014 18:13:56 +0000 (19:13 +0100)
		1	2
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/pgtable.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/include/asm/tlb.h	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mm/dma-mapping.c	patch \|	diff1 \|	diff2 \|	blob \| history