Merge branch 'acpi-init'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 25 Oct 2015 21:55:14 +0000 (22:55 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 25 Oct 2015 21:55:14 +0000 (22:55 +0100)
* acpi-init:
  clocksource: cosmetic: Drop OF 'dependency' from symbols
  clocksource / arm_arch_timer: Convert to ACPI probing
  clocksource: Add new CLKSRC_{PROBE,ACPI} config symbols
  clocksource / ACPI: Add probing infrastructure for ACPI-based clocksources
  irqchip / GIC: Convert the GIC driver to ACPI probing
  irqchip / ACPI: Add probing infrastructure for ACPI-based irqchips
  ACPI: Add early device probing infrastructure

1  2 
drivers/acpi/scan.c
include/linux/acpi.h

Simple merge
Simple merge