From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Mar 2022 16:27:52 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: baikal/mips/sdk6.1~6262
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=3baea12b151fd5768689c049455bf5ab77c51485;p=kernel.git

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

Pull input fixes from Dmitry Torokhov:
 "Two driver fixes:

   - a fix for zinitix touchscreen to properly report contacts

   - a fix for aiptek tablet driver to be more resilient to devices with
     incorrect descriptors"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: aiptek - properly check endpoint type
  Input: zinitix - do not report shadow fingers
---

3baea12b151fd5768689c049455bf5ab77c51485