Merge remote-tracking branch 'powerpc/next'

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

Tue, 20 Dec 2011 23:50:55 +0000 (10:50 +1100)

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

Tue, 20 Dec 2011 23:50:55 +0000 (10:50 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 23:50:55 +0000 (10:50 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 20 Dec 2011 23:50:55 +0000 (10:50 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/powerpc/mm/hugetlbpage.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 20 Dec 2011 23:50:55 +0000 (10:50 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 20 Dec 2011 23:50:55 +0000 (10:50 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/hugetlbpage.c	patch \|	diff1 \|	diff2 \|	blob \| history