From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sun, 12 Jan 2014 22:48:18 +0000 (+0100)
Subject: Merge branch 'pnp'
X-Git-Tag: v3.14-rc1~107^2~7
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a759012e5f9717a69c2c2f03d6c7fe435e150824;p=kernel%2Fkernel-generic.git

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()
---

a759012e5f9717a69c2c2f03d6c7fe435e150824