Merge tag 'platform-drivers-x86-v4.10-3' of git://git.infradead.org/users/dvhart...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2017 07:17:41 +0000 (23:17 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Jan 2017 07:17:41 +0000 (23:17 -0800)
commit88ba6cae15e38f609aba4f3881e1c404c432596c
tree86f767c79ebd6a4dad60daebf33fdc6b67c8aa8e
parent6989606a7224a2d5a925df22a49e4f7a0bfed0d6
parenta608a9d52fa4168efd478d684039ed545a69dbcd
Merge tag 'platform-drivers-x86-v4.10-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "Just two small fixes for platform drivers x86:

   - use brightness_set_blocking for LED-setting callbacks on Fujitsu
     laptops

   - fix surface3_button build errors"

* tag 'platform-drivers-x86-v4.10-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  platform/x86: fujitsu-laptop: use brightness_set_blocking for LED-setting callbacks
  platform/x86: fix surface3_button build errors