Merge remote-tracking branch 'cris/for-next'

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

Fri, 28 Jun 2013 01:10:06 +0000 (11:10 +1000)

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

Fri, 28 Jun 2013 01:10:06 +0000 (11:10 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:10:06 +0000 (11:10 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 01:10:06 +0000 (11:10 +1000)
diff --cc arch/cris/Kconfig
Simple merge
diff --cc arch/cris/arch-v32/drivers/Kconfig
Simple merge
diff --cc arch/cris/include/asm/processor.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 01:10:06 +0000 (11:10 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 01:10:06 +0000 (11:10 +1000)
		1	2
arch/cris/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/cris/arch-v32/drivers/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/cris/include/asm/processor.h	patch \|	diff1 \|	diff2 \|	blob \| history