summaryrefslogtreecommitdiffstats
path: root/drivers/acpi
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-11 13:31:35 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-02-11 13:31:35 +0100
commitb34bf8e3cd5039ccba7f478601188427b1a8cd0b (patch)
tree998ff3d21bd817ae159ea88eb20180d73f77bd6a /drivers/acpi
parentMerge branch 'acpi-lpss' (diff)
parentPNPACPI: Fix acpi_bus_get_device() check in drivers/pnp/pnpacpi/core.c (diff)
downloadlinux-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