linux/drivers/input
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
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
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
evbug.c
evdev.c
ff-core.c
ff-memless.c
fixp-arith.h
input.c
joydev.c
Kconfig
Makefile
mousedev.c
power.c
tsdev.c