c4ec334c5b00790ce0
parent abbe0d3c26c545930492981cbd64be340ff41e05
parent 8f9068609e8a5b4cbac9e0cf8332b5dcabf05422
author Linus Torvalds <torvalds@linux-foundation.org> 1316207359 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1316207359 -0700

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