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

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

Tue, 26 Jul 2011 01:47:16 +0000 (11:47 +1000)

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

Tue, 26 Jul 2011 01:47:16 +0000 (11:47 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 01:47:16 +0000 (11:47 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 26 Jul 2011 01:47:16 +0000 (11:47 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/mips/kernel/perf_event.c
Simple merge
diff --cc arch/mips/kernel/process.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 01:47:16 +0000 (11:47 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 26 Jul 2011 01:47:16 +0000 (11:47 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/perf_event.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/mips/kernel/process.c	patch \|	diff1 \|	diff2 \|	blob \| history