diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-12 06:56:56 -0500 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-02-12 06:56:56 -0500 |
| commit | 4b49b9fe2b5220374ddc1c122cc31e00cc20365f (patch) | |
| tree | d8c3c3ff835da7238cc0b1d6817f7bcf5b735ecd /drivers/char/toshiba.c | |
| parent | 7282059489868e0ed1b0d79765730c6b233a8399 (diff) | |
| parent | 21369c77477a7f937174833c8094154f0f995710 (diff) | |
Merge back earlier 'acpi-pci-hotplug' material.
Conflicts:
drivers/pci/hotplug/acpiphp_glue.c
Diffstat (limited to 'drivers/char/toshiba.c')
0 files changed, 0 insertions, 0 deletions