Merge branch 'for-linus' of git://github.com/dtor/input
Linus Torvalds [Fri, 16 Sep 2011 21:09:19 +0000 (14:09 -0700)]
* '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

1  2 
drivers/hid/hid-wacom.c

Simple merge