commit da2f912aef1106144c43b75f8719807dfad121b3
author Linus Torvalds <torvalds@linux-foundation.org> Thu Feb 11 11:17:19 2016 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Feb 11 11:17:19 2016 -0800
tree 3a84b79f2e7543bef046954ca702e1a5823948ac
parent 5de6ac75d928358063f37c874a91ca1ef28ac308
parent b1d353ad3d5835b16724653b33c05124e1b5acf1

Merge tag 'platform-drivers-x86-v4.5-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver fixes from Darren Hart:
 "Just two small fixes for the 4.5-rc cycle:

  intel_scu_ipcutil:
   - underflow in scu_reg_access()

  intel-hid:
   - fix incorrect entries in intel_hid_keymap"

* tag 'platform-drivers-x86-v4.5-3' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86:
  intel_scu_ipcutil: underflow in scu_reg_access()
  intel-hid: fix incorrect entries in intel_hid_keymap