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

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

Tue, 15 Nov 2011 23:01:44 +0000 (10:01 +1100)

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

Tue, 15 Nov 2011 23:01:44 +0000 (10:01 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:01:44 +0000 (10:01 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 15 Nov 2011 23:01:44 +0000 (10:01 +1100)
diff --cc MAINTAINERS
Simple merge
diff --cc include/asm-generic/page.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 15 Nov 2011 23:01:44 +0000 (10:01 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 15 Nov 2011 23:01:44 +0000 (10:01 +1100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
include/asm-generic/page.h	patch \|	diff1 \|	diff2 \|	blob \| history