aboutsummaryrefslogtreecommitdiffstats
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 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
|\ \ \ | |/ / |/| / | |/
| * Input: serio - offload resume to kseriodShaohua Li2008-07-231-18/+37
* | Undo duplicate "m68k: drivers/input/serio/hp_sdc.c needs <linux/semaphore.h>"Linus Torvalds2008-07-251-1/+0
* | Add missing semaphore.h includesMatthew Wilcox2008-07-241-0/+1
|/
* Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into nextDmitry Torokhov2008-07-214-3/+12
|\
| * tty: Ldisc revampAlan Cox2008-07-201-1/+1
| * Merge commit 'v2.6.26' into bkl-removalJonathan Corbet2008-07-142-10/+45
| |\
| | * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2008-06-172-2/+13
| | |\
| | * \ Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dto...Linus Torvalds2008-05-302-8/+32
| | |\ \
| * | | | serio: BKL pushdownArnd Bergmann2008-07-021-1/+5
| |/ / /
| * | | m68k: Return -ENODEV if no device is foundGeert Uytterhoeven2008-05-181-1/+1
| * | | m68k: Some input drivers do not check the platformGeert Uytterhoeven2008-05-181-0/+5
* | | | Input: i8042 - add Arima-Rioworks HDAMB board to noloop listDmitry Torokhov2008-07-191-0/+9
* | | | Input: add option to disable HP SDC driverHelge Deller2008-07-191-0/+9
* | | | Input: add new serio driver for Xilinx XPS PS2 IPJohn Linn2008-07-073-0/+391
* | | | Input: q40kbd - make q40kbd_lock staticAdrian Bunk2008-07-071-1/+1
* | | | Input: i8042 - add Dritek quirk for Acer Aspire 5720Carlos Corbacho2008-07-071-0/+7
* | | | Input: i8042 - add Medion NAM 2070 to noloop blacklistDmitry Torokhov2008-07-031-0/+8
* | | | Input: i8042 - add Gericom Bellagio to nomux blacklistJiri Kosina2008-07-031-0/+7
* | | | Input: i8042 - add Acer Aspire 1360 to nomux blacklistJiri Kosina2008-07-031-0/+7
* | | | Input: hp_sdc_mlc.c - make a struct staticAdrian Bunk2008-06-301-1/+1
* | | | Input: hil_mlc.c - make code staticAdrian Bunk2008-06-301-3/+3
* | | | Merge branch 'for-linus' into nextDmitry Torokhov2008-06-172-10/+45
|\ \ \ \ | | |_|/ | |/| |
| * | | Input: i8042 - retry failed CTR writes when resumingJiri Kosina2008-06-171-2/+6
| * | | Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux tableJiri Kosina2008-06-061-0/+7
| | |/ | |/|
| * | Input: i8042 - make sure Dritek quirk is invoked at resumeBruno Prémont2008-05-271-8/+25
| * | Input: i8042 - add Dritek quirk for Acer TravelMate 660Bruno Prémont2008-05-201-0/+7
| |/
* | Input: serio - remove pending events when unregistering driverDmitry Torokhov2008-06-021-3/+6