summaryrefslogtreecommitdiffstats
path: root/drivers/input/serio
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'next' into for-linusDmitry Torokhov2009-04-162-8/+57
|\
| * Input: i8042 - add a DMI table for the i8042.reset optionArjan van de Ven2009-04-111-0/+28
| * Input: i8042 - introduce a tougher resetArjan van de Ven2009-04-111-8/+29
* | Merge branch 'next' into for-linusDmitry Torokhov2009-04-081-0/+8
|\ \ | |/
| * Input: i8042 - add HP DV9700 to the noloop listDmitry Torokhov2009-04-071-0/+8
* | Merge branch 'origin' into develRussell King2009-03-281-3/+1
|\ \
| * | Rationalize fasync return valuesJonathan Corbet2009-03-161-3/+1
| |/
* | [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.hRussell King2009-03-251-1/+1
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2009-03-023-6/+6
|\
| * Input: ambakmi - fix timeout handling in amba_kmi_write()Roel Kluin2009-02-011-1/+1
| * Input: struct device - replace bus_id with dev_name(), dev_set_name()Kay Sievers2009-01-293-5/+5
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2009-01-066-114/+148
|\ \ | |/
| * Input: i8042 - add Dell Vostro 1510 to nomux listJiri Kosina2009-01-061-0/+7
| * Input: HIL drivers - add MODULE_ALIAS()Helge Deller2008-12-301-0/+1
| * Input: i8042 - add Gigabyte M912 netbook to noloop exception tableOzan Çağlayan2008-12-201-0/+8
| * Merge commit 'v2.6.28-rc9' into nextDmitry Torokhov2008-12-202-1/+14
| |\
| * | Input: libps2 - handle 0xfc responses from devicesDmitry Torokhov2008-11-241-4/+16
| * | Input: struct device - replace bus_id with dev_name(), dev_set_name()Kay Sievers2008-10-302-3/+3
| * | Input: xilinx_ps2 - various cleanupsJohn Linn2008-10-271-107/+113
* | | Merge git://git.marvell.com/orion into develRussell King2008-12-131-0/+14
|\ \ \ | | |/ | |/|
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2008-11-301-0/+14
| |\ \
| | * | Input: i8042 - add Compal Hel80 laptop to nomux blacklistDmitry Torokhov2008-11-191-0/+7
| | * | Input: i8042 - add Dell XPS M1530 to nomux listHerton Ronaldo Krzesinski2008-11-111-0/+7
* | | | [ARM] clps7500: remove supportRussell King2008-11-271-1/+1
|/ / /
* | | saner FASYNC handling on file closeAl Viro2008-11-011-1/+0
| |/ |/|
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2008-10-261-0/+8
|\ \ | |/
| * Input: i8042 - add Blue FB5601 to noloop exception tableStefan Bader2008-10-161-0/+8
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2008-10-162-0/+13
|\ \ | |/
| * Merge branch 'next' into for-linusDmitry Torokhov2008-10-152-0/+13
| |\
| | * Input: i8042 - add Thinkpad R31 to nomux listColin B Macdonald2008-10-131-0/+7
| | * Input: serio_raw - allow attaching to translated (SERIO_I8042XL) portsNiels de Vos2008-09-101-0/+6
* | | Merge commit 'origin'Benjamin Herrenschmidt2008-10-152-2/+2
|\ \ \
| * | | HP input: kill warnings due to suseconds_t differencesGeert Uytterhoeven2008-10-141-1/+1
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sp...David S. Miller2008-09-161-1/+1
| |\ \ \ | | |/ /
| * | | sparc: Annotate of_device_id arrays with const or __initdata.David S. Miller2008-08-311-1/+1
* | | | powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checksKumar Gala2008-09-231-1/+1
| |/ / |/| |
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2008-09-061-1/+1
|\ \ \ | |/ / |/| |
| * | Input: i8042 - make Lenovo 3000 N100 blacklist entry more specificJiri Kosina2008-09-041-1/+1
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2008-08-152-2/+9
|\ \ \ | |/ /
| * | Input: xilinx_ps2 - fix warningAndrew Morton2008-08-101-2/+2
| * | Merge commit 'v2.6.27-rc1' into for-linusDmitry Torokhov2008-08-081-1/+1
| |\ \ | | |/
| * | Input: i8042 - Add Dritek quirk for Acer TravelMate 4280Carlos Corbacho2008-08-061-0/+7
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2008-08-131-1/+2
|\ \ \
| * | | sparc/drivers: use linux/of_device.h instead of asm/of_device.hStephen Rothwell2008-08-111-1/+2
* | | | Merge branch 'for-linus-merged' of master.kernel.org:/home/rmk/linux-2.6-armLinus Torvalds2008-08-081-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/machRussell King2008-08-071-1/+1
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixesRussell King2008-08-071-18/+37
| |\ \ \ | | | |/ | | |/|
| * | | [ARM] Remove asm/hardware.h, use asm/arch/hardware.h insteadRussell King2008-08-071-1/+1
* | | | sparc: i8042-sparcio.h: fix warningAlexander Beregalov2008-08-061-6/+13
| |/ / |/| |
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2008-07-281-18/+37
|\ \ \ | |/ / |/| / | |/
OpenPOWER on IntegriCloud