From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 6 Jan 2014 21:59:57 +0000 (+0100)
Subject: Merge branch 'pnp'
X-Git-Tag: next-20140107~67^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=422783c4823a73aaa760d76f28ef4370f1c096cb;p=karo-tx-linux.git

Merge branch 'pnp'

* pnp:
  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()
---

422783c4823a73aaa760d76f28ef4370f1c096cb