diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-30 00:24:40 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-07-30 00:24:40 +0200 |
| commit | feb41bb1ca6b969985cd5e486a3f2deac9f089fa (patch) | |
| tree | aeb6c21669858b06c1086cb3fe4d5d8124329835 /drivers/acpi/acpi_pnp.c | |
| parent | b6328a07bd6b3d31b64f85864fe74f3b08c010ca (diff) | |
| parent | e70dba6020eaaceb1d3619dfb535c719900c7091 (diff) | |
Merge back earlier acpi-pnp material.
Conflicts:
drivers/pnp/pnpacpi/core.c
Diffstat (limited to 'drivers/acpi/acpi_pnp.c')
0 files changed, 0 insertions, 0 deletions