Merge branch 'cpuidle-perf-events' into idle-test
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 23:06:19 +0000 (18:06 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 23:06:19 +0000 (18:06 -0500)
commit43952886f0b8b3c344c3392b88de067d5fa5419a
treec1a738f11a479246c09976902be5b73aaf731722
parent56dbed129df3fdd4caf9018b6e7599ee258a5420
parentf77cfe4ea21760268c0277fa3e4b02dfd2a2c2f4
Merge branch 'cpuidle-perf-events' into idle-test
arch/x86/kernel/process.c
drivers/cpuidle/cpuidle.c
drivers/idle/intel_idle.c