Merge branch 'mipsr6-for-3.20' of git://git.linux-mips.org/pub/scm/mchandras/linux...

author Ralf Baechle <ralf@linux-mips.org>

Thu, 19 Feb 2015 15:00:34 +0000 (16:00 +0100)

committer Ralf Baechle <ralf@linux-mips.org>

Thu, 19 Feb 2015 15:00:34 +0000 (16:00 +0100)
author Ralf Baechle <ralf@linux-mips.org>
Thu, 19 Feb 2015 15:00:34 +0000 (16:00 +0100)
committer Ralf Baechle <ralf@linux-mips.org>
Thu, 19 Feb 2015 15:00:34 +0000 (16:00 +0100)
diff --cc arch/mips/Makefile
Simple merge
diff --cc arch/mips/kernel/mips_ksyms.c
Simple merge
author	Ralf Baechle <ralf@linux-mips.org>
	Thu, 19 Feb 2015 15:00:34 +0000 (16:00 +0100)
committer	Ralf Baechle <ralf@linux-mips.org>
	Thu, 19 Feb 2015 15:00:34 +0000 (16:00 +0100)
		1	2
arch/mips/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/mips_ksyms.c	patch \|	diff1 \|	diff2 \|	blob \| history