R0dn3yS/android_kernel_xiaomi_sm7250
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4c1ac1b491
android_kernel_xiaomi_sm7250/drivers/usb/gadget
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
..
at91_udc.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
at91_udc.h USB: AT91 UDC updates, mostly power management 2006-08-02 16:41:41 -07:00
config.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
dummy_hcd.c [PATCH] misc arm pt_regs fixes 2006-10-08 12:32:36 -07:00
epautoconf.c [PATCH] USB: gadget section fixups 2006-07-12 16:03:24 -07:00
ether.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
file_storage.c [PATCH] namespaces: utsname: use init_utsname when appropriate 2006-10-02 07:57:21 -07:00
gadget_chips.h [PATCH] USB: fix gadget_is_musbhdrc() 2006-04-14 11:12:24 -07:00
gmidi.c Remove all inclusions of <linux/config.h> 2006-10-04 03:38:54 -04:00
goku_udc.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
goku_udc.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
inode.c [PATCH] Vectorize aio_read/aio_write fileop methods 2006-10-01 00:39:28 -07:00
Kconfig Still more typo fixes 2006-10-03 22:36:44 +02:00
lh7a40x_udc.c USB: lh7a40x_udc remove double declaration 2006-12-01 14:23:37 -08:00
lh7a40x_udc.h Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
Makefile USB: gmidi: New USB MIDI Gadget class driver. 2006-09-27 11:58:52 -07:00
ndis.h [PATCH] USB: rndis updates (mostly cleanup) 2005-06-27 14:43:50 -07:00
net2280.c USB: net2280: don't send unwanted zero-length packets 2006-12-01 14:23:36 -08:00
net2280.h USB: net2280: don't send unwanted zero-length packets 2006-12-01 14:23:36 -08:00
omap_udc.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
omap_udc.h [PATCH] USB: more omap_udc updates (dma and omap1710) 2005-06-27 14:43:50 -07:00
pxa2xx_udc.c USB: pxa2xx_udc recognizes ixp425 rev b0 chip 2006-12-01 14:23:37 -08:00
pxa2xx_udc.h USB: pxa2xx_udc understands GPIO based VBUS sensing 2006-09-27 11:58:48 -07:00
rndis.c [PATCH] USB: gadget section fixups 2006-07-12 16:03:24 -07:00
rndis.h [PATCH] USB: gadget section fixups 2006-07-12 16:03:24 -07:00
serial.c [PATCH] namespaces: utsname: use init_utsname when appropriate 2006-10-02 07:57:21 -07:00
usbstring.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
zero.c [PATCH] namespaces: utsname: use init_utsname when appropriate 2006-10-02 07:57:21 -07:00