From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 16 Sep 2011 21:09:19 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://github.com/dtor/input
X-Git-Tag: firefly_0821_release~3680^2~4455
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=279b1e0fd90ef63c7acb34a5ca573f065a6fefb4

Merge branch 'for-linus' of git://github.com/dtor/input

* 'for-linus' of git://github.com/dtor/input:
  Input: wacom - fix touch parsing on newer Bamboos
  Input: bcm5974 - add MacBookAir4,1 trackpad support
  Input: wacom - add POINTER and DIRECT device properties
  Input: adp5588-keys - remove incorrect modalias
  Input: cm109 - fix checking return value of usb_control_msg
  Input: wacom - advertise BTN_TOOL_PEN and BTN_STYLUS for PenPartner
  Input: wacom - remove pressure for touch devices
---

279b1e0fd90ef63c7acb34a5ca573f065a6fefb4