summaryrefslogtreecommitdiffstats
path: root/drivers/input/tablet (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' into for-linusDmitry Torokhov2013-02-202-102/+92
|\
| * Input: wacom - add support for DTH-2242Ping Cheng2013-02-142-1/+25
| * Input: wacom - use new input-mt routinesPing Cheng2013-01-062-61/+22
| * Input: wacom - prepare for syncing with input-mt changesPing Cheng2013-01-061-40/+45
* | Input: wacom - fix wacom_set_report retry logicChris Bagwell2013-01-241-3/+3
* | Merge branch 'next' into for-linusDmitry Torokhov2012-12-173-21/+68
|\|
| * Input: wacom - add support for a new MT device (0x4001)Ping Cheng2012-11-211-0/+4
| * Input: wacom - simplify type check for newer V5 devicesPing Cheng2012-11-211-3/+1
| * Input: wacom - add support for 2 new multi-touch tablets (0x100 and 0x101)Ping Cheng2012-11-083-3/+25
| * Input: wacom - clean up device type codePing Cheng2012-11-081-15/+38
* | Input: wacom - fix touch support for Bamboo Fun CTH-461Diego Calleja2012-12-041-1/+2
|/
* Input: wacom - correct bad Cintiq 24HD checkJason Gerecke2012-10-301-1/+1
* Merge tag 'v3.7-rc3' into for-linus to sync up with recent USB changesDmitry Torokhov2012-10-303-5/+139
|\
| * Input: wacom - add touch sensor support for Cintiq 24HD touchJason Gerecke2012-10-263-3/+104
| * Input: wacom - handle split-sensor devices with internal hubsJason Gerecke2012-10-263-2/+35
* | Input: wacom - add INPUT_PROP_DIRECT flag to Cintiq 24HDJason Gerecke2012-10-251-0/+3
|/
* Merge branch 'next' into for-linusDmitry Torokhov2012-10-112-48/+133
|\
| * Input: wacom - clean up wacom_query_tablet_dataJason Gerecke2012-10-051-39/+35
| * Input: wacom - introduce wacom_fix_phy_from_hidJason Gerecke2012-10-051-0/+71
| * Input: wacom - allow any multi-input Intuos device to set proxJason Gerecke2012-10-041-2/+2
| * Input: wacom - report correct touch contact size for I5/BambooJason Gerecke2012-10-041-4/+22
| * Merge branch 'for-next' of git://github.com/rydberg/linux into nextDmitry Torokhov2012-10-011-3/+3
| |\
| | * Input: MT - Add flags to input_mt_init_slots()Henrik Rydberg2012-09-191-3/+3
| * | Input: wacom - add support for EMR on Cintiq 24HD touchJason Gerecke2012-09-051-1/+5
| |/
* | Input: wacom - mark Intuos5 pad as in-prox when touching buttonsJason Gerecke2012-09-281-1/+1
* | Input: wacom - add support for EMR on Cintiq 24HD touchJason Gerecke2012-08-221-1/+5
|/
* Input: wacom - add support to Cintiq 22HDPing Cheng2012-07-252-3/+21
* Input: hanwang - add support for Art Master II tabletweixing2012-07-131-15/+42
* Merge branch 'for-linus' to bring in change ensuring that drivers thatDmitry Torokhov2012-07-081-2/+4
|\
| * Input: wacom - don't retrieve touch_max when it is predefinedPing Cheng2012-06-291-1/+3
| * Input: wacom - fix retrieving touch_max bugPing Cheng2012-06-291-1/+1
* | Merge commit 'v3.5-rc5' into nextDmitry Torokhov2012-07-045-75/+104
|\ \
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-05-245-110/+457
| |\|
| * | USB: input: wacom_sys.c: fix up dev_* messagesGreg Kroah-Hartman2012-05-051-2/+2
| * | USB: input: kbtab.c: fix up dev_* messagesGreg Kroah-Hartman2012-05-051-3/+7
| * | USB: input: gtco.c: fix up dev_* messagesGreg Kroah-Hartman2012-05-051-3/+5
| * | USB: input: aiptek.c: fix up dev_* messagesGreg Kroah-Hartman2012-05-051-8/+9
| * | USB: input: acecad.c: fix up dev_* messagesGreg Kroah-Hartman2012-05-051-3/+6
| * | USB: kbtab.c: remove dbg() usageGreg Kroah-Hartman2012-05-021-2/+4
| * | USB: gtco.c: remove dbg() usageGreg Kroah-Hartman2012-05-021-42/+45
| * | USB: aiptek.c: remove dbg() usageGreg Kroah-Hartman2012-05-021-9/+13
| * | USB: acecad.c: remove dbg() usageGreg Kroah-Hartman2012-05-021-2/+4
| * | USB: wacom: remove dbg() usageGreg Kroah-Hartman2012-05-022-9/+17
| * | USB: input: wacom_sys.c: fix up dev_err() usageGreg Kroah-Hartman2012-05-021-2/+2
| * | USB: input: kbtab.c: fix up dev_err() usageGreg Kroah-Hartman2012-05-021-1/+1
| * | USB: input: gtco.c: fix up dev_err() usageGreg Kroah-Hartman2012-05-021-1/+1
| * | USB: input: aiptek.c: fix up dev_err() usageGreg Kroah-Hartman2012-05-021-1/+1
| * | USB: input: acecad.c: fix up dev_err() usageGreg Kroah-Hartman2012-05-021-1/+1
| * | USB: wacom_sys.c: remove err() usageGreg Kroah-Hartman2012-04-251-2/+3
| * | USB: kbtab.c: remove err() usageGreg Kroah-Hartman2012-04-251-2/+3