diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-11 13:31:35 +0100 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-02-11 13:31:35 +0100 |
commit | b34bf8e3cd5039ccba7f478601188427b1a8cd0b (patch) | |
tree | 998ff3d21bd817ae159ea88eb20180d73f77bd6a /drivers/acpi | |
parent | Merge branch 'acpi-lpss' (diff) | |
parent | PNPACPI: Fix acpi_bus_get_device() check in drivers/pnp/pnpacpi/core.c (diff) | |
download | linux-b34bf8e3cd5039ccba7f478601188427b1a8cd0b.tar.xz linux-b34bf8e3cd5039ccba7f478601188427b1a8cd0b.zip |
Merge branch 'pnp'
* pnp:
PNPACPI: Fix acpi_bus_get_device() check in drivers/pnp/pnpacpi/core.c
drivers/pnp/pnpbios: remove depends on CONFIG_EXPERIMENTAL
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions