Merge remote-tracking branch 'thermal/next'

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

Fri, 28 Jun 2013 02:49:49 +0000 (12:49 +1000)

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

Fri, 28 Jun 2013 02:49:49 +0000 (12:49 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 02:49:49 +0000 (12:49 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Fri, 28 Jun 2013 02:49:49 +0000 (12:49 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc arch/x86/kernel/cpu/mcheck/therm_throt.c
Simple merge
diff --cc drivers/staging/Kconfig
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 02:49:49 +0000 (12:49 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Fri, 28 Jun 2013 02:49:49 +0000 (12:49 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/cpu/mcheck/therm_throt.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/staging/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history