Merge branch 'acpi-lpss'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 28 Jun 2013 10:59:02 +0000 (12:59 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 28 Jun 2013 10:59:02 +0000 (12:59 +0200)
commitf4c9f402389977dc852ef4848c7615926306735d
treecf0c6c7e7f1dbbb1790443ab22f8a102c0428fd5
parent3b4550e0e0cd24d8073dc571cecb0d4aa4ca3542
parent958c4eb2aa325099ea1f54c7354e381e3d79f3ae
Merge branch 'acpi-lpss'

* acpi-lpss:
  ACPI / LPSS: override SDIO private register space size from ACPI tables
  ACPI / LPSS: mask the UART TX completion interrupt
  ACPI / LPSS: add support for Intel BayTrail

Conflicts:
drivers/acpi/acpi_lpss.c (with commit b9e95fc)
drivers/acpi/acpi_lpss.c