Commits

Merge branches 'upstream' and 'ntrig-multitouch' into for-linus
Showing diff tofa047e4f6fa
- Randy Dunlap committed 8ebf975608ablock: fix kernel-doc in recent block/ changes Fix kernel-doc warnings in recently cha...
- Jiri Kosina committed fa047e4f6faHID: fix inverted wheel for bluetooth version of apple mighty mouse Bluetooth version ...
- Stephane Chatty committed 57fd637ad9aHID: Multitouch support for the N-Trig touchscreen Adds support for multitouch interac...