Merge back earlier 'acpi-assorted' material
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 14 Aug 2013 21:22:45 +0000 (23:22 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 14 Aug 2013 21:22:45 +0000 (23:22 +0200)
1  2 
drivers/acpi/battery.c
drivers/acpi/internal.h
drivers/acpi/processor_core.c
drivers/acpi/processor_driver.c
drivers/acpi/scan.c
drivers/acpi/video.c
include/acpi/acpi_bus.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge