openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/net/e1000
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
e1000.h e1000: add dynamic itr modes 2006-12-02 00:12:00 -05:00
e1000_ethtool.c e1000: add queue restart counter 2006-12-02 00:12:00 -05:00
e1000_hw.c e1000: rename ICH8 flash macros 2006-12-02 00:12:00 -05:00
e1000_hw.h e1000: rename ICH8 flash macros 2006-12-02 00:12:00 -05:00
e1000_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
e1000_osdep.h e1000: rename ICH8 flash macros 2006-12-02 00:12:00 -05:00
e1000_param.c e1000: add dynamic itr modes 2006-12-02 00:12:00 -05:00