Merge remote-tracking branch 'cpupowerutils/master'

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

Thu, 28 Jul 2011 01:50:47 +0000 (11:50 +1000)

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

Thu, 28 Jul 2011 01:50:47 +0000 (11:50 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jul 2011 01:50:47 +0000 (11:50 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 28 Jul 2011 01:50:47 +0000 (11:50 +1000)
diff --cc CREDITS
Simple merge
diff --cc MAINTAINERS
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 28 Jul 2011 01:50:47 +0000 (11:50 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 28 Jul 2011 01:50:47 +0000 (11:50 +1000)
		1	2
CREDITS	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history