From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Jun 2017 08:30:44 +0000 (+0900)
Subject: Merge tag 'platform-drivers-x86-v4.12-2' of git://git.infradead.org/linux-platform... 
X-Git-Tag: v4.12-rc6~28
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=f69d64deedc19ed1345d5e75176671a84e0cccdc;p=linux-2.6-block.git

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
---

f69d64deedc19ed1345d5e75176671a84e0cccdc