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

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

Sun, 1 Nov 2015 22:10:53 +0000 (09:10 +1100)

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

Sun, 1 Nov 2015 22:10:53 +0000 (09:10 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 22:10:53 +0000 (09:10 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 1 Nov 2015 22:10:53 +0000 (09:10 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc mm/huge_memory.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 1 Nov 2015 22:10:53 +0000 (09:10 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 1 Nov 2015 22:10:53 +0000 (09:10 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
mm/huge_memory.c	patch \|	diff1 \|	diff2 \|	blob \| history