davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
66888a6e5f
kernel-ark/drivers/input
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
..
gameport Input: fm801-gp - handle errors from pci_enable_device() 2006-10-12 01:06:53 -04:00
joystick usb: iforce-usb free urb cleanup 2006-12-01 14:23:32 -08:00
keyboard WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
misc [PATCH] hp drivers/input stuff: C99 initializers, NULL noise removal, __user annotations 2006-10-15 11:00:58 -07:00
mouse WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
serio Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 2006-12-05 14:37:56 +00:00
touchscreen sh: Cleanup board header directories. 2006-10-19 16:30:32 +09:00
evbug.c Input: make input_register_handler() return error codes 2006-09-14 01:32:39 -04:00
evdev.c Input: make input_register_handler() return error codes 2006-09-14 01:32:39 -04:00
ff-core.c Input: implement new force feedback interface 2006-07-19 01:40:22 -04:00
ff-memless.c Input: unified force feedback support for memoryless devices 2006-07-19 01:40:30 -04:00
fixp-arith.h Input: move fixp-arith.h to drivers/input 2006-07-19 01:40:14 -04:00
input.c Input: make input_register_handler() return error codes 2006-09-14 01:32:39 -04:00
joydev.c Input: make input_register_handler() return error codes 2006-09-14 01:32:39 -04:00
Kconfig Input: unified force feedback support for memoryless devices 2006-07-19 01:40:30 -04:00
Makefile Input: unified force feedback support for memoryless devices 2006-07-19 01:40:30 -04:00
mousedev.c Input: make input_register_handler() return error codes 2006-09-14 01:32:39 -04:00
power.c Input: make input_register_handler() return error codes 2006-09-14 01:32:39 -04:00
tsdev.c Input: make input_register_handler() return error codes 2006-09-14 01:32:39 -04:00