Merge branches 'idle-fix' and 'misc' into release
authorLen Brown <len.brown@intel.com>
Sat, 7 Apr 2012 01:48:59 +0000 (21:48 -0400)
committerLen Brown <len.brown@intel.com>
Sat, 7 Apr 2012 01:48:59 +0000 (21:48 -0400)
1  2 
drivers/acpi/processor_idle.c
drivers/cpuidle/cpuidle.c

Simple merge
Simple merge