From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jun 2016 19:01:14 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
X-Git-Tag: v4.7-rc6~30
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=595d9e34eedc4b8d0631260ce93bbeb08e5b3bd7;hp=-c;p=cascardo%2Flinux.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/hid

Pull HID fix from Jiri Kosina:
 "Regression fix for multitouch palm rejection from Allen Hung"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
  HID: multitouch: enable palm rejection for Windows Precision Touchpad
  Revert "HID: multitouch: enable palm rejection if device implements confidence usage"
---

595d9e34eedc4b8d0631260ce93bbeb08e5b3bd7