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)
* acpi-config:
  ACPI: delete CONFIG_ACPI_BLACKLIST_YEAR

1  2 
drivers/acpi/Kconfig
drivers/acpi/blacklist.c

Simple merge
Simple merge