Merge remote-tracking branch 'mips/mips-for-linux-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 12 Sep 2013 00:28:44 +0000 (10:28 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 12 Sep 2013 00:28:44 +0000 (10:28 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 00:28:44 +0000 (10:28 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 12 Sep 2013 00:28:44 +0000 (10:28 +1000)
diff --cc arch/mips/Kconfig
Simple merge
diff --cc drivers/gpio/Kconfig
Simple merge
diff --cc drivers/gpio/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 12 Sep 2013 00:28:44 +0000 (10:28 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 12 Sep 2013 00:28:44 +0000 (10:28 +1000)
		1	2
arch/mips/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/gpio/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history