Merge tag 'platform-drivers-x86-v4.12-2' of git://git.infradead.org/linux-platform...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jun 2017 08:30:44 +0000 (17:30 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 16 Jun 2017 08:30:44 +0000 (17:30 +0900)
commitf69d64deedc19ed1345d5e75176671a84e0cccdc
tree3a80f24ba87a36ad7267d0c1a5a7d71cbd1f401f
parente78e4626d43ce3143cb6d2942735d75595be7d1e
parentbf5d008164dd84d671ca2dd569a1676051f9faff
Merge tag 'platform-drivers-x86-v4.12-2' of git://git.infradead.org/linux-platform-drivers-x86

Pull x86 platform driver fix from Darren Hart:
 "Just a single patch to fix an oops in the intel_telemetry_debugfs
  module load/unload"

* tag 'platform-drivers-x86-v4.12-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: intel_telemetry_debugfs: fix oops when load/unload module