1
0
Fork 0
alistair23-linux/drivers/input/serio
Linus Torvalds 952f4a0a9b Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: appletouch - implement reset-resume logic
  Input: i8042 - retry failed CTR writes when resuming
  Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table
  Input: pcspkr - remove negative dependency on snd-pcsp

Manually fixed up trivial conflict in drivers/usb/core/quirks.c
2008-06-17 18:10:40 -07:00
..
Kconfig Input: add PS/2 serio driver for AVR32 devices 2008-04-15 01:30:47 -04:00
Makefile Input: add PS/2 serio driver for AVR32 devices 2008-04-15 01:30:47 -04:00
ambakmi.c some kmalloc/memset ->kzalloc (tree wide) 2007-07-19 10:04:50 -07:00
at32psif.c Input: at32psif - update MODULE_AUTHOR with new email 2008-04-24 13:25:18 -04:00
ct82c710.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
gscps2.c drivers/input/: Spelling fixes 2008-02-03 17:15:20 +02:00
hil_mlc.c Input: HIL - fix rwlock recursion bug 2007-03-16 00:59:29 -04:00
hp_sdc.c m68k: drivers/input/serio/hp_sdc.c needs <linux/semaphore.h> 2008-05-05 12:37:25 -07:00
hp_sdc_mlc.c m68k: Some input drivers do not check the platform 2008-05-18 13:28:49 -07:00
i8042-io.h input: i8042: sh64 IRQ definitions depend on cayman board. 2008-05-08 19:51:42 +09:00
i8042-ip22io.h Input: make i8042_platform_init return 'real' error code 2005-09-04 01:41:38 -05:00
i8042-jazzio.h Input: make i8042_platform_init return 'real' error code 2005-09-04 01:41:38 -05:00
i8042-ppcio.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
i8042-snirm.h Input: i8042 - add SNI RM support 2008-03-14 11:54:06 -04:00
i8042-sparcio.h [SPARC64]: Fix of_iounmap() region release. 2006-12-31 14:06:05 -08:00
i8042-x86ia64io.h Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table 2008-06-06 01:38:08 -04:00
i8042.c Input: i8042 - retry failed CTR writes when resuming 2008-06-17 11:47:27 -04:00
i8042.h Input: i8042 - add SNI RM support 2008-03-14 11:54:06 -04:00
libps2.c Input: drop redundant includes of moduleparam.h 2008-01-21 01:11:07 -05:00
maceps2.c define global BIT macro 2007-10-19 11:53:42 -07:00
parkbd.c [PARPORT] Remove unused 'irq' argument from parport irq functions 2007-10-23 19:53:16 -04:00
pcips2.c some kmalloc/memset ->kzalloc (tree wide) 2007-07-19 10:04:50 -07:00
q40kbd.c m68k: Return -ENODEV if no device is found 2008-05-18 13:28:50 -07:00
rpckbd.c Input: add MODULE_ALIAS() to hotpluggable platform modules 2008-04-24 13:24:59 -04:00
sa1111ps2.c some kmalloc/memset ->kzalloc (tree wide) 2007-07-19 10:04:50 -07:00
serio.c freezer: introduce freezer-friendly waiting macros 2007-10-18 14:37:19 -07:00
serio_raw.c Input: serio_raw - shut up errorneous warning 2007-07-10 00:38:31 -04:00
serport.c tty: The big operations rework 2008-04-30 08:29:47 -07:00