From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Jul 2014 22:42:53 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
X-Git-Tag: firefly_0821_release~176^2~3565
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b292d6b5c4220d527c92316c0d11d16e9895f07e;p=firefly-linux-kernel-4.4.55.git

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

Pull input layer fixes from Dmitry Torokhov:
 "A few fixups for the input subsystem"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: document INPUT_PROP_TOPBUTTONPAD
  Input: fix defuzzing logic
  Input: sirfsoc-onkey - fix GPL v2 license string typo
  Input: st-keyscan - fix 'defined but not used' compiler warnings
  Input: synaptics - add min/max quirk for pnp-id LEN2002 (Edge E531)
  Input: i8042 - add Acer Aspire 5710 to nomux blacklist
  Input: ti_am335x_tsc - warn about incorrect spelling
  Input: wacom - cleanup multitouch code when touch_max is 2
---

b292d6b5c4220d527c92316c0d11d16e9895f07e