korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 14:04:05 +08:00
Code Issues Packages Projects Releases Wiki Activity
4c1ac1b491
linux/drivers/input/serio
History
David Howells 4c1ac1b491 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 
Conflicts:

	drivers/infiniband/core/iwcm.c
	drivers/net/chelsio/cxgb2.c
	drivers/net/wireless/bcm43xx/bcm43xx_main.c
	drivers/net/wireless/prism54/islpci_eth.c
	drivers/usb/core/hub.h
	drivers/usb/input/hid-core.c
	net/core/netpoll.c

Fix up merge failures with Linus's head and fix new compilation failures.

Signed-Off-By: David Howells <dhowells@redhat.com>
2006-12-05 14:37:56 +00:00
..
ambakmi.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
ct82c710.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
gscps2.c Build fixes for struct pt_regs removal 2006-10-06 20:47:23 -06:00
hil_mlc.c [PATCH] hp drivers/input stuff: C99 initializers, NULL noise removal, __user annotations 2006-10-15 11:00:58 -07:00
hp_sdc_mlc.c BUG_ON() Conversion in input/serio/hp_sdc_mlc.c 2006-03-26 18:23:47 +02:00
hp_sdc.c [PATCH] hp drivers/input stuff: C99 initializers, NULL noise removal, __user annotations 2006-10-15 11:00:58 -07:00
i8042-io.h [PATCH] update legacy io handling for pmac 2006-10-01 00:39:23 -07: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-sparcio.h [PATCH] sparc i8042 build fix 2006-07-03 15:27:00 -07:00
i8042-x86ia64io.h Input: i8042 - disable MUX mode on Toshiba Equium A110 2006-09-14 01:31:06 -04:00
i8042.c Input: i8042 - supress ACK/NAKs when blinking during panic 2006-10-11 01:44:28 -04:00
i8042.h Input: i8042 - get rid of polling timer 2006-09-10 21:57:21 -04:00
Kconfig [PATCH] m68k/HP300: Enable HIL configuration options 2006-10-09 14:54:45 -07:00
libps2.c WorkStruct: Pass the work_struct pointer instead of context data 2006-11-22 14:55:48 +00:00
maceps2.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
Makefile Input: kill remnants of 98kbd{,-io} and 98spkr 2006-02-15 00:49:48 -05:00
parkbd.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
pcips2.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
q40kbd.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
rpckbd.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
sa1111ps2.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
serio_raw.c Driver core: change misc class_devices to be real devices 2006-12-01 14:51:59 -08:00
serio.c Input: serio core - handle errors returned by device_bind_driver() 2006-10-12 01:06:23 -04:00
serport.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00