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

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

Tue, 24 Jul 2012 23:41:21 +0000 (09:41 +1000)

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

Tue, 24 Jul 2012 23:41:21 +0000 (09:41 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:41:21 +0000 (09:41 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 24 Jul 2012 23:41:21 +0000 (09:41 +1000)
diff --cc drivers/spi/Kconfig
Simple merge
diff --cc lib/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 24 Jul 2012 23:41:21 +0000 (09:41 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 24 Jul 2012 23:41:21 +0000 (09:41 +1000)
		1	2
drivers/spi/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
lib/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history