summaryrefslogtreecommitdiffstats
path: root/include/acpi/acpi_bus.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 12:59:02 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-06-28 12:59:02 +0200
commitf4c9f402389977dc852ef4848c7615926306735d (patch)
treecf0c6c7e7f1dbbb1790443ab22f8a102c0428fd5 /include/acpi/acpi_bus.h
parent3b4550e0e0cd24d8073dc571cecb0d4aa4ca3542 (diff)
parent958c4eb2aa325099ea1f54c7354e381e3d79f3ae (diff)
downloadlinux-f4c9f402389977dc852ef4848c7615926306735d.tar.gz
linux-f4c9f402389977dc852ef4848c7615926306735d.tar.bz2
linux-f4c9f402389977dc852ef4848c7615926306735d.zip
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)
Diffstat (limited to 'include/acpi/acpi_bus.h')
0 files changed, 0 insertions, 0 deletions