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 S. Miller b2f8f7525c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/forcedeth.c		16 years ago
..
Makefile	…
e1000.h	e1000: drop lltx, remove unnecessary lock	16 years ago
e1000_ethtool.c	e1000: Use device_set_wakeup_enable	16 years ago
e1000_hw.c	trivial: fix then -> than typos in comments and documentation	16 years ago
e1000_hw.h	e1000: convert uint16_t style integers to u16	17 years ago
e1000_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	16 years ago
e1000_osdep.h	e1000: Remove spaces after casts and function names	17 years ago
e1000_param.c	e1000: fix stack size	17 years ago