]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'pnp'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Jan 2014 21:59:57 +0000 (22:59 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 6 Jan 2014 21:59:57 +0000 (22:59 +0100)
commit422783c4823a73aaa760d76f28ef4370f1c096cb
tree5d4251a71aee30c96e0add33cd618e9dc162870d
parent1634f9bdf75250437817ae929a956b7851baa861
parent62c6dae02d4fe2bfa6bc699ae456ff1c50d10bd0
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()
drivers/pnp/pnpacpi/core.c