diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-06 17:32:41 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-06 17:32:41 +0100 |
| commit | b169ba5ae49a810876f3baa5da5283e95c836527 (patch) | |
| tree | e2ef3cf5ce41c01541a3557e9d1c5847399c37a7 /lib/timerqueue.c | |
| parent | ACPI / hotplug / PCI: Rework acpiphp_check_host_bridge() (diff) | |
| parent | ACPI / hotplug: Fix panic on eject to ejected device (diff) | |
Merge branch 'acpi-hotplug' into acpi-pci-hotplug
Conflicts:
drivers/acpi/scan.c
Diffstat (limited to 'lib/timerqueue.c')
0 files changed, 0 insertions, 0 deletions