UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/net/ixgb
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
..
Makefile e100, e1000, ixgb: update copyright header and remove LICENSE 2006-09-27 12:53:14 -07:00
ixgb.h ixgb: combine more rx descriptors to improve performance 2006-09-27 12:54:17 -07:00
ixgb_ee.c e100, e1000, ixgb: update copyright header and remove LICENSE 2006-09-27 12:53:14 -07:00
ixgb_ee.h e100, e1000, ixgb: update copyright header and remove LICENSE 2006-09-27 12:53:14 -07:00
ixgb_ethtool.c e100, e1000, ixgb: update copyright header and remove LICENSE 2006-09-27 12:53:14 -07:00
ixgb_hw.c e100, e1000, ixgb: update copyright header and remove LICENSE 2006-09-27 12:53:14 -07:00
ixgb_hw.h e100, e1000, ixgb: update copyright header and remove LICENSE 2006-09-27 12:53:14 -07:00
ixgb_ids.h e100, e1000, ixgb: update copyright header and remove LICENSE 2006-09-27 12:53:14 -07:00
ixgb_main.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
ixgb_osdep.h e100, e1000, ixgb: update copyright header and remove LICENSE 2006-09-27 12:53:14 -07:00
ixgb_param.c e100, e1000, ixgb: update copyright header and remove LICENSE 2006-09-27 12:53:14 -07:00