You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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>		18 years ago
..
Kconfig	USB: use MII hooks only if CONFIG_MII is enabled	19 years ago
Makefile	USB: driver for mcs7830 (aka DeLOCK) USB ethernet adapter	19 years ago
asix.c	USB: endianness fix for asix.c	18 years ago
catc.c	usb: catc free urb cleanup	18 years ago
cdc_ether.c	USB: cdc_ether: Use usb_endpoint_* functions	18 years ago
cdc_subset.c	…
gl620a.c	…
kaweth.c	WorkStruct: make allyesconfig	18 years ago
kawethfw.h	…
mcs7830.c	usbnet: add a mutex around phy register access	19 years ago
net1080.c	USB: net1080: Fix && typos	18 years ago
pegasus.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	18 years ago
pegasus.h	WorkStruct: make allyesconfig	18 years ago
plusb.c	…
rndis_host.c	…
rtl8150.c	…
usbnet.c	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	18 years ago
usbnet.h	usbnet: add a mutex around phy register access	19 years ago
zaurus.c	…