leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into for-3.12/upstream

Browse Source 
Sync with Linus' tree to be able to apply fixup patch on top
of 9d9a04ee75 ("HID: apple: Add support for the 2013 Macbook Air")

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Jiri Kosina
2013-09-04 10:49:39 +02:00
parent 6c2794a298 58c59bc997
commit efd15f5f4f
5117 changed files with 271426 additions and 184323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/input/multi-touch-protocol.txt
View File

@@ -80,6 +80,8 @@ Userspace can detect that a driver can report more total contacts than slots
by noting that the largest supported BTN_TOOL_*TAP event is larger than the
total number of type B slots reported in the absinfo for the ABS_MT_SLOT axis.
The minimum value of the ABS_MT_SLOT axis must be 0.
Protocol Example A
------------------