summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2014-12-174-61/+38
|\
| * Merge branch 'next' into for-linusDmitry Torokhov2014-12-154-61/+38
| |\
| | * Input: initialize device counter variables with -1Aniroop Mathur2014-12-032-4/+4
| | * Input: i8042 - do not try to load on Intel NUC D54250WYKTodor Minchev2014-12-021-0/+10
| | * Input: altera_ps2 - switch to using managed resourcesTobias Klauser2014-10-311-57/+24
* | | Merge branch 'platform/remove_owner' of git://git.kernel.org/pub/scm/linux/ke...Greg Kroah-Hartman2014-11-0312-12/+0
|\ \ \ | |/ / |/| |
| * | input: serio: drop owner assignment from platform_driversWolfram Sang2014-10-2012-12/+0
| |/
* | Revert "Input: i8042 - disable active multiplexing by default"Dmitry Torokhov2014-10-312-9/+274
* | Input: altera_ps2 - use correct type for irq return valueTobias Klauser2014-10-311-1/+1
* | Input: altera_ps2 - write to correct register when disabling interruptsTobias Klauser2014-10-311-1/+1
* | Input: i8042 - quirks for Fujitsu Lifebook A544 and Lifebook AH544Hans de Goede2014-10-241-0/+16
|/
* Input: i8042 - disable active multiplexing by defaultDmitry Torokhov2014-10-112-274/+9
* Input: i8042 - add noloop quirk for Asus X750LNHans de Goede2014-10-111-0/+6
* Merge tag 'v3.17' into nextDmitry Torokhov2014-10-114-8/+64
|\
| * Input: i8042 - fix Asus X450LCP touchpad detectionMarcos Paulo de Souza2014-09-241-0/+7
| * Input: i8042 - also set the firmware id for MUXed portsHans de Goede2014-09-111-0/+2
| * Input: i8042 - add nomux quirk for Avatar AVIU-145A6Hans de Goede2014-09-111-0/+7
| * Input: i8042 - add Fujitsu U574 to no_timeout dmi tableHans de Goede2014-09-111-0/+8
| * Input: serport - add compat handling for SPIOCSTYPE ioctlJohn Sung2014-09-101-7/+38
| * Input: sparc - i8042-sparcio.h: fix unused kbd_res warningVincent Stehlé2014-08-191-1/+2
* | Input: serio - avoid negative serio device numbersRichard Leitner2014-10-091-2/+2
|/
* Merge branch 'next' into for-linusDmitry Torokhov2014-08-061-0/+13
|\
| * Input: hyperv-keyboard - register as a wakeup sourceDexuan Cui2014-08-061-0/+13
* | Input: i8042 - add Acer Aspire 5710 to nomux blacklistJiri Kosina2014-07-141-0/+7
|/
* Merge branch 'next' into for-linusDmitry Torokhov2014-06-072-2/+2
|\
| * Merge tag 'v3.15-rc5' into nextDmitry Torokhov2014-05-143-0/+35
| |\
| * | Input: apbps2 - make of_device_id array constJingoo Han2014-05-141-1/+1
| * | Input: olpc_apsp - make of_device_id array constJingoo Han2014-05-141-1/+1
* | | Input: ambakmi - request a shared interrupt for AMBA KMI devicesLiviu Dudau2014-05-131-1/+2
| |/ |/|
* | Input: i8042 - add firmware_id supportHans de Goede2014-04-192-0/+21
* | Input: serio - add firmware_id sysfs attributeHans de Goede2014-04-191-0/+14
|/
* Input: olpc_apsp - fix dependencies of OLPC AP-SP driverJean Delvare2014-03-231-1/+1
* Input: hp_sdc - use del_timer_sync() in exit pathThomas Gleixner2014-03-231-1/+1
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2014-01-2411-14/+11
|\
| * Input: hyperv-keyboard - pass through 0xE1 prefixK. Y. Srinivasan2014-01-121-1/+3
| * Input: delete non-required instances of include <linux/init.h>Paul Gortmaker2014-01-069-9/+0
| * Input: i8042 - cleanup SERIO_I8042 dependenciesMark Salter2014-01-021-3/+8
| * Merge tag 'v3.13-rc4' into nextDmitry Torokhov2013-12-164-50/+65
| |\
| * | Input: serio - remove unnecessary pci_set_drvdata()Jingoo Han2013-11-251-1/+0
* | | Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-armLinus Torvalds2014-01-231-2/+0
|\ \ \
| * | | ARM: 7904/1: input: ambakmi: Remove unnecessary amba_set_drvdata()Michal Simek2013-12-291-2/+0
| | |/ | |/|
* | | Merge 3.13-rc4 into tty-nextGreg Kroah-Hartman2013-12-161-7/+17
|\| |
| * | Input: serio - fix sysfs layoutDmitry Torokhov2013-12-091-7/+17
* | | tty: Always handle NULL flag ptrPeter Hurley2013-12-081-13/+15
|/ /
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2013-11-151-1/+1
|\ \
| * | treewide: fix "distingush" typoMichael Opdenacker2013-10-141-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2013-11-154-3/+453
|\ \ \
| * \ \ Merge branch 'next' into for-linusDmitry Torokhov2013-11-146-14/+465
| |\ \ \ | | | |/ | | |/|
| | * | Input: allow deselecting serio drivers even without CONFIG_EXPERTTom Gundersen2013-10-311-3/+3
| | * | Input: i8042 - add PNP modaliasesTom Gundersen2013-10-311-0/+2