Merge branch 'cpuidle-perf-events' into idle-test

author Len Brown <len.brown@intel.com>

Wed, 12 Jan 2011 23:06:19 +0000 (18:06 -0500)

committer Len Brown <len.brown@intel.com>

Wed, 12 Jan 2011 23:06:19 +0000 (18:06 -0500)
author Len Brown <len.brown@intel.com>
Wed, 12 Jan 2011 23:06:19 +0000 (18:06 -0500)
committer Len Brown <len.brown@intel.com>
Wed, 12 Jan 2011 23:06:19 +0000 (18:06 -0500)
diff --cc arch/x86/kernel/process.c
Simple merge
diff --cc drivers/cpuidle/cpuidle.c
Simple merge
diff --cc drivers/idle/intel_idle.c
Simple merge
author	Len Brown <len.brown@intel.com>
	Wed, 12 Jan 2011 23:06:19 +0000 (18:06 -0500)
committer	Len Brown <len.brown@intel.com>
	Wed, 12 Jan 2011 23:06:19 +0000 (18:06 -0500)
		1	2
arch/x86/kernel/process.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/cpuidle/cpuidle.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/idle/intel_idle.c	patch \|	diff1 \|	diff2 \|	blob \| history