Merge branch 'acpi-config'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 16 Nov 2013 14:45:00 +0000 (15:45 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 16 Nov 2013 14:45:00 +0000 (15:45 +0100)
commiteb64821243cd6f72646b3ffb9ee2245f83256b32
tree6b57877b8d8ae33b160103ecfa362a2867909b20
parenta7d2472d8145f6d0729317e3cabe2d0f1a14a87a
parent4c47cb197e136912f4eecc68ab9410487f2df831
Merge branch 'acpi-config'

* acpi-config:
  ACPI: delete CONFIG_ACPI_BLACKLIST_YEAR
drivers/acpi/Kconfig
drivers/acpi/blacklist.c