lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7f4b45c526
android_kernel_xiaomi_sm8350/drivers/usb/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
..
acecad.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
aiptek.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
appletouch.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
ati_remote2.c usb: ati_remote2 free urb cleanup 2006-12-01 14:23:33 -08:00
ati_remote.c usb: ati_remote free urb cleanup 2006-12-01 14:23:33 -08:00
hid-core.c 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
hid-debug.h
hid-ff.c
hid-input.c USB: correct keymapping on Powerbook built-in USB ISO keyboards 2006-11-16 14:26:11 -08:00
hid-lgff.c
hid-pidff.c
hid-tmff.c
hid-zpff.c
hid.h USB HID: Handle STALL on interrupt endpoint 2006-12-01 14:23:27 -08:00
hiddev.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
itmtouch.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
kbtab.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
Kconfig usbtouchscreen: add support for DMC TSC-10/25 devices 2006-12-01 14:23:37 -08:00
keyspan_remote.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
Makefile USB: move trancevibrator.c to the proper usb directory 2006-10-17 14:46:32 -07:00
map_to_7segment.h
mtouchusb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
powermate.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
touchkitusb.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
usbkbd.c usb: usbkbd free urb cleanup 2006-12-01 14:23:33 -08:00
usbmouse.c USB: usbmouse: Use usb_endpoint_* functions 2006-12-01 14:23:29 -08:00
usbtouchscreen.c usbtouchscreen: add support for DMC TSC-10/25 devices 2006-12-01 14:23:37 -08:00
wacom_sys.c USB: make drivers/usb/input/wacom_sys.c:wacom_sys_irq() static 2006-12-01 14:23:30 -08:00
wacom_wac.c USB: Wacom driver updates 2006-10-17 14:46:30 -07:00
wacom_wac.h USB: Wacom driver updates 2006-10-17 14:46:30 -07:00
wacom.h USB: make drivers/usb/input/wacom_sys.c:wacom_sys_irq() static 2006-12-01 14:23:30 -08:00
xpad.c USB: xpad: additional USB id's added 2006-11-03 11:57:18 -08:00
yealink.c USB: yealink: Use usb_endpoint_* functions 2006-12-01 14:23:29 -08:00
yealink.h