| commit | 279b1e0fd90ef63c7acb34a5ca573f065a6fefb4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 16 14:09:19 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Sep 16 14:09:19 2011 -0700 |
| tree | 25dfe9e76c375c2357096fc4ec334c5b00790ce0 | |
| parent | abbe0d3c26c545930492981cbd64be340ff41e05 [diff] | |
| parent | 8f9068609e8a5b4cbac9e0cf8332b5dcabf05422 [diff] |
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