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)
commitb34bf8e3cd5039ccba7f478601188427b1a8cd0b
tree998ff3d21bd817ae159ea88eb20180d73f77bd6a
parent17b1639b30e080dc577cbffe7a08d063708ec789
parentcfc57557f204c09c2c028be6e18923e9475c311d
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