Merge remote-tracking branch 'staging/staging-next'

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

Thu, 21 Mar 2013 04:27:40 +0000 (15:27 +1100)

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

Thu, 21 Mar 2013 04:27:40 +0000 (15:27 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:27:40 +0000 (15:27 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 21 Mar 2013 04:27:40 +0000 (15:27 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/staging/zcache/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 21 Mar 2013 04:27:40 +0000 (15:27 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 21 Mar 2013 04:27:40 +0000 (15:27 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/staging/zcache/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history