leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4c1ac1b491
linux/drivers/usb/net
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
..
asix.c USB: endianness fix for asix.c 2006-12-01 14:25:51 -08:00
catc.c usb: catc free urb cleanup 2006-12-01 14:23:34 -08:00
cdc_ether.c USB: cdc_ether: Use usb_endpoint_* functions 2006-12-01 14:23:27 -08:00
cdc_subset.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
gl620a.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
kaweth.c WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
kawethfw.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
Kconfig USB: use MII hooks only if CONFIG_MII is enabled 2006-11-03 11:57:19 -08:00
Makefile USB: driver for mcs7830 (aka DeLOCK) USB ethernet adapter 2006-10-17 14:46:32 -07:00
mcs7830.c usbnet: add a mutex around phy register access 2006-10-17 14:46:32 -07:00
net1080.c USB: net1080: Fix && typos 2006-12-01 14:23:30 -08:00
pegasus.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
pegasus.h WorkStruct: make allyesconfig 2006-11-22 14:57:56 +00:00
plusb.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
rndis_host.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00
rtl8150.c IRQ: Maintain regs pointer globally rather than passing to IRQ handlers 2006-10-05 15:10:12 +01:00
usbnet.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
usbnet.h usbnet: add a mutex around phy register access 2006-10-17 14:46:32 -07:00
zaurus.c Remove obsolete #include <linux/config.h> 2006-06-30 19:25:36 +02:00