Merge tag 'platform-drivers-x86-v4.8-4' of git://git.infradead.org/users/dvhart/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Aug 2016 19:20:22 +0000 (12:20 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 29 Aug 2016 19:20:22 +0000 (12:20 -0700)
commitcf4d3779e5ccfc2886e1e4ca19adaf59636f963d
treef5e64fbb15dec559ca2f2ee6b743bf6d4dfea8c3
parent2a90309e062382ca0bd10bc2004abcab8fa0944b
parentda43bf0c21e57fff0221da5de0a9a388ec0d27cd
Merge tag 'platform-drivers-x86-v4.8-4' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "Remove module related code from two drivers that are only configurable
  as built-in: intel_pmic_gpio and platform/olpc"

* tag 'platform-drivers-x86-v4.8-4' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  intel_pmic_gpio: Make explicitly non-modular
  platform/olpc: Make ec explicitly non-modular