summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
Commit message (Expand)AuthorAgeFilesLines
* BKL: remove extraneous #include <smp_lock.h>Arnd Bergmann2010-11-171-1/+0
* Input: i8042 - add Sony VAIOs to MUX blacklistJesse Barnes2010-11-041-0/+11
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-10-255-45/+410
|\
| * Input: serio - add support for PS2Mult multiplexer protocolDmitry Eremin-Solenikov2010-10-183-0/+328
| * Merge branch 'for-linus' into nextDmitry Torokhov2010-10-171-1/+1
| |\
| * | Input: serio - support multiple child devices per single parentDmitry Eremin-Solenikov2010-10-131-43/+81
| * | Input: i8042 - use unsigned char for 0x90Christoph Fritz2010-09-291-1/+1
| * | Input: serio - do not include linux/freezer.hDmitry Torokhov2010-09-141-1/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6Linus Torvalds2010-10-221-0/+1
|\ \ \
| * | | serport: place serport serio device correctly in the device treeDmitry Eremin-Solenikov2010-10-221-0/+1
| | |/ | |/|
* | | Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2010-10-221-0/+1
|\ \ \
| * | | llseek: automatically add .llseek fopArnd Bergmann2010-10-151-0/+1
| |/ /
* | | input: Serio/hp_sdc: semaphore cleanupThomas Gleixner2010-10-121-2/+2
* | | input: Serio/hil_mlc: semaphore cleanupThomas Gleixner2010-10-121-3/+3
|/ /
* / Input: i8042 - fix device removal on unloadDmitry Torokhov2010-08-311-1/+1
|/
* Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-122-6/+6
|\
| * of/device: Replace struct of_device with struct platform_deviceGrant Likely2010-08-062-6/+6
* | panic: keep blinking in spite of long spin timer modeTAMUKI Shoichi2010-08-111-20/+5
|/
* Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2010-08-051-7/+6
|\
| * of/platform: remove all of_bus_type and of_platform_bus_type referencesGrant Likely2010-07-241-3/+2
| * Merge commit 'v2.6.35-rc6' into devicetree/nextGrant Likely2010-07-241-0/+17
| |\
| * | sparc/of: Move of_device fields into struct pdev_archdataGrant Likely2010-06-281-4/+4
* | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/pow...Linus Torvalds2010-08-051-0/+5
|\ \ \
| * \ \ Merge commit 'gcl/next' into nextBenjamin Herrenschmidt2010-08-042-1/+18
| |\ \ \ | | | |/ | | |/|
| * | | powerpc: Add i8042 keyboard and mouse irq parsingMartyn Welch2010-07-091-0/+5
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-08-042-99/+41
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch 'next' into for-linusDmitry Torokhov2010-08-022-99/+41
| |\ \ \
| | * | | Input: i8042 - reset keyboard controller wehen resuming from S2RDmitry Torokhov2010-07-201-24/+41
| | * | | Merge commit 'v2.6.35-rc3' into nextDmitry Torokhov2010-06-301-1/+2
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Input: i8042 - remove SPRUCE supportChristoph Egger2010-06-041-75/+0
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-07-221-0/+7
|\| | | |
| * | | | Input: i8042 - add Gigabyte Spring Peak to dmi_noloop_tableKamal Mostafa2010-07-191-0/+7
| | |_|/ | |/| |
* | | | input: i8042 - add runtime check in x86's i8042_platform_initFeng Tang2010-07-071-0/+10
* | | | Revert "Input: fixup X86_MRST selects"Feng Tang2010-07-071-1/+1
|/ / /
* | / Input: fixup X86_MRST selectsRandy Dunlap2010-06-221-1/+1
| |/ |/|
* | input: serio: disable i8042 for non-cayman sh platforms.Paul Mundt2010-05-251-1/+2
|/
* Merge remote branch 'origin' into secretlab/next-devicetreeGrant Likely2010-05-224-0/+208
|\
| * Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2010-05-213-0/+194
| |\
| | * input: serio: add support for Amstrad Delta serial keyboardportJanusz Krzysztofik2010-05-053-0/+194
| * | Input: i8042 - add a PNP entry to the aux device listMatthew Garrett2010-05-191-0/+1
| * | Input: i8042 - add some extra PNP keyboard typesMatthew Garrett2010-05-191-0/+13
| * | Merge branch 'for-linus' into nextDmitry Torokhov2010-04-131-1/+1
| |\ \
* | | | of: Remove duplicate fields from of_platform_driverGrant Likely2010-05-222-4/+10
* | | | of: Always use 'struct device.of_node' to get device node pointer.Grant Likely2010-05-182-5/+5
| |_|/ |/| |
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-04-151-1/+1
|\ \ \ | |/ / |/| / | |/
| * Input: i8042 - spelling fixDominik Brodowski2010-04-051-1/+1
* | include cleanup: Update gfp.h and slab.h includes to prepare for breaking imp...Tejun Heo2010-03-3012-1/+11
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2010-03-143-22/+23
|\|
| * Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset tableChristoph Fritz2010-03-131-0/+7
| * Input: serio_raw - remove BKLThadeu Lima de Souza Cascardo2010-03-091-6/+5