Merge branch 'acpi-cleanup'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 23 Jul 2013 01:58:07 +0000 (03:58 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 23 Jul 2013 01:58:07 +0000 (03:58 +0200)
commitb9eb179fe6d9acc11a54194d2df147e991f049aa
tree6e7f3562f7fe3c6987bfbeb69f8fd8e16909d35e
parentc70d65052a1c792bae8d1bb84845f15526b74997
parent2efbca4dfc7b43951de6dd1647f9eebda9d4372b
Merge branch 'acpi-cleanup'

Subsequent commits depend on the 'acpi-cleanup' material.
drivers/acpi/scan.c
drivers/acpi/video.c
drivers/acpi/video_detect.c