]> Pileus Git - ~andy/linux/commit
Merge branch 'pnp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Jan 2014 22:48:18 +0000 (23:48 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sun, 12 Jan 2014 22:48:18 +0000 (23:48 +0100)
commita759012e5f9717a69c2c2f03d6c7fe435e150824
tree4b44266e68b2047fd676201bea70f6de39a647b3
parentbcc7201a91176f815f48f8ad889a20c5c829d9a9
parentd8254e0e72c8cc6131f789f8645338b719f57648
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()
drivers/pnp/pnpacpi/core.c