Merge branch 'throttling' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:01:08 +0000 (05:01 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 10:01:08 +0000 (05:01 -0500)
commitfe3ded5078e957d80c43837e1966429cf0029c10
tree3d119165a177c5aef9490defde861c4e733191e6
parent77cff3b0d6349cc0212056238108b827b3cc353b
parent5a344a505093dd65f82f338ffdb7208321b3630e
Merge branch 'throttling' into release
drivers/acpi/processor_driver.c
drivers/acpi/processor_throttling.c