Merge tag 'pnp-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Jan 2018 18:47:31 +0000 (10:47 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Jan 2018 18:47:31 +0000 (10:47 -0800)
commit1c7385dbf8c55d0866172fdf70320c8f11b1ac15
tree0581f09281e33a58577824440a1df8b6ed21c44c
parent1a9a126b5098160ca934a352617e9e65dbfa679d
parent846583ce151644b8538ca6cdf3f0857a80787649
Merge tag 'pnp-4.16-rc1' of git://git./linux/kernel/git/rafael/linux-pm

Pull PNP updates from Rafael Wysocki:
 "These make pnpbios_thread_init() use PTR_ERR_OR_ZERO() and remove an
  unnecessary kallsyms include from drivers/pnp/quirks.c (Vasyl
  Gomonovych, Sergey Senozhatsky)"

* tag 'pnp-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: pnpbios: Use PTR_ERR_OR_ZERO()
  PNP: remove unneeded kallsyms include