summaryrefslogtreecommitdiffstats
path: root/drivers/input
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/a...Linus Torvalds2015-09-013-0/+239
|\
| * Merge tag 'imx-soc-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/shaw...Olof Johansson2015-08-183-0/+239
| |\
| | * input: snvs_pwrkey: use "wakeup-source" as deivce tree property nameShawn Guo2015-07-181-1/+1
| | * input: keyboard: imx: add snvs power key driverRobin Gong2015-07-153-0/+239
* | | Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2015-09-012-4/+4
|\ \ \
| * \ \ Merge branch 'x86/urgent' into x86/asm to fix up conflicts and to pick up fixesIngo Molnar2015-08-189-62/+146
| |\ \ \
| * \ \ \ Merge branch 'x86/urgent' into x86/asm, before applying dependent patchesIngo Molnar2015-07-317-16/+68
| |\ \ \ \
| * | | | | x86/asm/tsc: Rename native_read_tsc() to rdtsc()Andy Lutomirski2015-07-062-4/+4
| * | | | | x86/asm/tsc, drivers/input/gameport: Replace rdtscl() with native_read_tsc()Andy Lutomirski2015-07-061-2/+2
| * | | | | x86/asm/tsc, input/joystick/analog: Switch from rdtscl() to native_read_tsc()Andy Lutomirski2015-07-061-2/+2
| | |_|_|/ | |/| | |
| | | | |
| \ \ \ \
| \ \ \ \
| \ \ \ \
*---. \ \ \ \ Merge remote-tracking branches 'regulator/topic/lp872x', 'regulator/topic/ltc...Mark Brown2015-08-304-386/+83
|\ \ \ \ \ \ \ | | | |/ / / / | | |/| | | / | | |_|_|_|/ | |/| | | |
| | | * | | Input: Remove the max77843 haptic driverKrzysztof Kozlowski2015-08-073-372/+0
| | | * | | Input: max77693: Add support for Maxim 77843Krzysztof Kozlowski2015-08-072-6/+48
| | | * | | Input: max77693: Prepare for adding support for Maxim 77843Krzysztof Kozlowski2015-08-071-7/+34
| | | * | | Input: max77693: Remove a read-only pwm_divisor fieldKrzysztof Kozlowski2015-08-071-3/+1
| | | * | | drivers: max77843: Switch to common max77693 state containerKrzysztof Kozlowski2015-07-161-1/+2
| | | * | | drivers: max77693: Move state container to common headerKrzysztof Kozlowski2015-07-161-0/+1
| | |/ / /
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2015-08-211-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Input: gpio_keys_polled - request GPIO pin as input.Vincent Pelletier2015-08-201-1/+1
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2015-08-096-6/+31
|\| | | |
| * | | | Input: elantech - add special check for fw_version 0x470f01 touchpadDuson Lin2015-08-072-2/+21
| * | | | Input: twl4030-vibra - fix ERROR: Bad of_node_put() warningMarek Belisko2015-08-051-1/+2
| * | | | Input: alps - only Dell laptops have separate button bits for v2 dualpoint st...Hans de Goede2015-08-031-2/+6
| * | | | Input: axp20x-pek - add module aliasChen-Yu Tsai2015-08-031-0/+1
| * | | | Input: turbografx - fix potential out of bound accessDmitry Torokhov2015-08-031-1/+1
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2015-07-303-56/+115
|\| | | | | |_|_|/ |/| | |
| * | | Revert "Input: zforce - don't overwrite the stack"Dmitry Torokhov2015-07-281-1/+1
| * | | Input: bcm5974 - add support for the 2015 Macbook ProJohn Horan2015-07-271-2/+31
| * | | Input: bcm5974 - prepare for a new trackpad generationHenrik Rydberg2015-07-271-51/+81
| * | | Input: synaptics - dump ext10 capabilities as wellJiri Kosina2015-07-271-2/+2
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2015-07-245-8/+62
|\| | | | |/ / |/| |
| * | Input: goodix - fix touch coordinates on WinBook TW100 and TW700Bastien Nocera2015-07-241-0/+36
| * | Input: LEDs - skip unnamed LEDsDmitry Torokhov2015-07-241-2/+14
| * | Input: usbtouchscreen - avoid unresponsive TSC-30 touch screenBernhard Bender2015-07-231-0/+3
| * | Input: elantech - force resolution of 31 u/mmPeter Hutterer2015-07-161-5/+8
| * | Input: zforce - don't overwrite the stackOleksij Rempel2015-07-161-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2015-07-112-8/+6
|\| | | |/ |/|
| * Revert "Input: synaptics - allocate 3 slots to keep stability in image sensors"Dmitry Torokhov2015-07-101-1/+1
| * Input: elan_i2c - change the hover event from MT to STduson2015-07-071-7/+5
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2015-07-0411-74/+1293
|\|
| * Merge branch 'next' into for-linusDmitry Torokhov2015-07-0311-74/+1293
| |\
| | * Input: wdt87xx_i2c - add a scaling factor for TOUCH_MAJOR eventHungNien Chen2015-07-011-5/+14
| | * Input: wdt87xx_i2c - remove stray newline in diagnostic messageDmitry Torokhov2015-07-011-1/+1
| | * Input: arc_ps2 - add HAS_IOMEM dependencySebastian Ott2015-06-291-0/+1
| | * Input: wdt87xx_i2c - fix format warningDmitry Torokhov2015-06-291-1/+1
| | * Input: improve parsing OF parameters for touchscreensDmitry Torokhov2015-06-253-27/+46
| | * Input: edt-ft5x06 - mark as direct input deviceDmitry Torokhov2015-06-251-6/+1
| | * Input: use for_each_set_bit() where appropriateAnshul Garg2015-06-251-25/+9
| | * Input: add a driver for wdt87xx touchscreen controllerHungNien Chen2015-06-243-0/+1153
| | * Input: axp20x-pek - fix reporting button state as invertedHans de Goede2015-06-241-2/+6