tree 4b44266e68b2047fd676201bea70f6de39a647b3
parent bcc7201a91176f815f48f8ad889a20c5c829d9a9
parent d8254e0e72c8cc6131f789f8645338b719f57648
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1389566898 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1389566898 +0100

Merge branch 'pnp'

* pnp:
  PNPBIOS: check return value of pnp_add_device()
  PNP: Mark the function pnp_build_option() as static in resource.c
  PNP / card: add missing put_device() call
  PNPACPI: check return value of pnp_add_device()