Merge tag 'platform-drivers-x86-v4.6-3' of git://git.infradead.org/users/dvhart/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Apr 2016 15:57:11 +0000 (08:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 27 Apr 2016 15:57:11 +0000 (08:57 -0700)
Pull x86 platform driver fix from Darren Hart:
 "Fix regression caused by hotkey enabling value in toshiba_acpi"

* tag 'platform-drivers-x86-v4.6-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  toshiba_acpi: Fix regression caused by hotkey enabling value


Trivial merge