]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
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)
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


Trivial merge