Merge branches 'sh/st-integration' and 'sh/stackprotector' into sh-latest

author Paul Mundt <lethal@linux-sh.org>

Thu, 19 Apr 2012 08:31:59 +0000 (17:31 +0900)

committer Paul Mundt <lethal@linux-sh.org>

Thu, 19 Apr 2012 08:31:59 +0000 (17:31 +0900)
author Paul Mundt <lethal@linux-sh.org>
Thu, 19 Apr 2012 08:31:59 +0000 (17:31 +0900)
committer Paul Mundt <lethal@linux-sh.org>
Thu, 19 Apr 2012 08:31:59 +0000 (17:31 +0900)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/sh/Kconfig
Simple merge
diff --cc arch/sh/mm/fault_32.c
Simple merge
author	Paul Mundt <lethal@linux-sh.org>
	Thu, 19 Apr 2012 08:31:59 +0000 (17:31 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Thu, 19 Apr 2012 08:31:59 +0000 (17:31 +0900)
		1	2	3
MAINTAINERS	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/sh/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history
arch/sh/mm/fault_32.c	patch \|	diff1 \|	diff2 \|	diff3 \|	blob \| history