summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-10-131-4/+2
|\
| * Merge branch 'next' into for-linusDmitry Torokhov2012-10-118-12/+10
| |\
| | * Input: atmel_mxt_ts - simplify mxt_dump_messageAndy Shevchenko2012-10-041-4/+2
| | * Merge branch 'for-next' of git://github.com/rydberg/linux into nextDmitry Torokhov2012-10-018-8/+8
| | |\
* | | \ Merge tag 'mfd-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/...Linus Torvalds2012-10-051-16/+111
|\ \ \ \
| * | | | mfd: 88pm860x: Move gpadc init into touchHaojian Zhuang2012-10-021-6/+85
| * | | | mfd: 88pm860x: Device tree supportHaojian Zhuang2012-10-021-15/+31
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-10-021-1/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'next' into for-linusDmitry Torokhov2012-10-011-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge tag 'v3.6-rc4' into nextDmitry Torokhov2012-09-042-8/+14
| | |\ \ \ | | | |/ /
| | * | | Input: s3c2410_ts - make s3c_ts_pmops constSachin Kamat2012-08-311-1/+1
* | | | | Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2012-10-021-1/+1
|\ \ \ \ \
| * | | | | workqueue: deprecate flush[_delayed]_work_sync()Tejun Heo2012-08-201-1/+1
* | | | | | Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2012-10-011-1/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson2012-09-221-1/+1
| |\ \ \ \ \ \
| | * | | | | | ARM: samsung: move platform_data definitionsArnd Bergmann2012-09-191-1/+1
| | | |_|_|/ / | | |/| | | |
| | | | | | |
| \ \ \ \ \ \
| \ \ \ \ \ \
| \ \ \ \ \ \
*---. \ \ \ \ \ \ Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogi...Jiri Kosina2012-10-012-4/+47
|\ \ \ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | / / / | | |_|_|_|/ / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Input: edt-ft5x06 - return -EFAULT on copy_to_user() errorAxel Lin2012-09-191-3/+6
| * | | | | | Merge tag 'v3.6-rc5' into for-linusDmitry Torokhov2012-09-192-8/+14
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-09-081-1/+1
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Input: usbtouchscreen - initialize eGalax devicesForest Bond2012-09-041-0/+40
| | |/ / / / | |/| | | |
| * | | | | Input: edt-ft5x06 - fix build error when compiling wthout CONFIG_DEBUG_FSGuenter Roeck2012-08-211-1/+1
| | |_|_|/ | |/| | |
* | | | | Input: MT - Add flags to input_mt_init_slots()Henrik Rydberg2012-09-198-8/+8
| |/ / / |/| | |
* | | | Input: eeti_ts: pass gpio value instead of IRQArnd Bergmann2012-08-091-8/+13
| |_|/ |/| |
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-07-303-0/+912
|\ \ \ | |/ /
| * | Input: add driver for FT5x06 based EDT displaysSimon Budig2012-07-243-0/+912
* | | Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds2012-07-271-0/+1
|\ \ \ | |/ / |/| |
| | |
| | \
| *-. \ Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linusRussell King2012-07-271-0/+1
| |\ \ \ | | |_|/ | |/| |
| | | * ARM: sa11x0/pxa: convert OS timer registers to IOMEMRussell King2012-07-091-0/+1
| | |/
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2012-07-068-8/+12
| |\ \ | | |/ | |/|
* | | Input: add MELFAS mms114 touchscreen driverJoonyoung Shim2012-07-173-0/+557
* | | Input: wacom_i2c - fix compiler warningDmitry Torokhov2012-07-071-1/+1
* | | Pull input changes from Henrik Rydberg, including large update toDmitry Torokhov2012-07-071-222/+241
|\ \ \
| * | | Revert "Input: atmel_mxt_ts - warn if sysfs could not be created"Henrik Rydberg2012-07-051-1/+4
| * | | Input: atmel_mxt_ts - parse T6 reportsDaniel Kurtz2012-06-291-4/+19
| * | | Input: atmel_mxt_ts - send all MT-B slots in one input reportDaniel Kurtz2012-06-291-5/+10
| * | | Input: atmel_mxt_ts - use T9 reportid range to init number of mt slotsDaniel Kurtz2012-06-291-8/+8
| * | | Input: atmel_mxt_ts - refactor reportid checking in mxt_interruptDaniel Kurtz2012-06-291-6/+8
| * | | Input: atmel_mxt_ts - cache T9 reportid range when reading object tableDaniel Kurtz2012-06-291-35/+41
| * | | Input: atmel_mxt_ts - refactor when and how object table is freedDaniel Kurtz2012-06-291-7/+16
| * | | Input: atmel_mxt_ts - add detail to touchevent debug messageDaniel Kurtz2012-06-291-3/+14
| * | | Input: atmel_mxt_ts - simplify event reportingDaniel Kurtz2012-06-291-76/+13
| * | | Input: atmel_mxt_ts - add sysfs entries to read fw and hw versionDaniel Kurtz2012-06-291-0/+24
| * | | Input: atmel_mxt_ts - update driver ID info loggingDaniel Kurtz2012-06-291-4/+4
| * | | Input: atmel_mxt_ts - read ID information block in one i2c transactionDaniel Kurtz2012-06-291-23/+3
| * | | Input: atmel_mxt_ts - optimize writing of object table entriesDaniel Kurtz2012-06-291-12/+12
| * | | Input: atmel_mxt_ts - add variable length __mxt_write_regDaniel Kurtz2012-06-291-5/+18
| * | | Input: atmel_mxt_ts - return errors from i2c layerDaniel Kurtz2012-06-291-8/+20
| * | | Input: atmel_mxt_ts - print all instances when dumping objectsDaniel Kurtz2012-06-291-10/+26
| * | | Input: atmel_mxt_ts - print less overhead when dumping objectsDaniel Kurtz2012-06-291-8/+4
OpenPOWER on IntegriCloud