Merge tag 'pnp-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Aug 2016 03:30:52 +0000 (23:30 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 6 Aug 2016 03:30:52 +0000 (23:30 -0400)
commit62e6e9bab3014e3931ffbc82de7a9d2fd94cb8cd
tree3e98e6c33500854d63a5d3a246da179867da6da1
parent0524b422fa39fe3dd9454c8667da283241dde9e7
parent61a67a366d5b5f9e3c8f27d056a3a67ede2a0026
Merge tag 'pnp-extra-4.8-rc1' of git://git./linux/kernel/git/rafael/linux-pm

Pull PNP fix from Rafael Wysocki:
 "This fixes build errors due to a missing header file inclusion in
  drivers/pnp/pnpbios/core.c (Randy Dunlap)"

* tag 'pnp-extra-4.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PNP: pnpbios: add header file to fix build errors