Merge branch 'pnp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 11 Feb 2013 12:31:35 +0000 (13:31 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 11 Feb 2013 12:31:35 +0000 (13:31 +0100)
* pnp:
  PNPACPI: Fix acpi_bus_get_device() check in drivers/pnp/pnpacpi/core.c
  drivers/pnp/pnpbios: remove depends on CONFIG_EXPERIMENTAL


Trivial merge