diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 12:59:02 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-28 12:59:02 +0200 |
| commit | f4c9f402389977dc852ef4848c7615926306735d (patch) | |
| tree | cf0c6c7e7f1dbbb1790443ab22f8a102c0428fd5 /drivers/clk/clk-wm831x.c | |
| parent | 3b4550e0e0cd24d8073dc571cecb0d4aa4ca3542 (diff) | |
| parent | 958c4eb2aa325099ea1f54c7354e381e3d79f3ae (diff) | |
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 'drivers/clk/clk-wm831x.c')
0 files changed, 0 insertions, 0 deletions