David S. Miller 198d6ba4d7 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/isdn/i4l/isdn_net.c fs/cifs/connect.c		2008-11-18 23:38:23 -08:00
..
e1000_82575.c	igb: remove 82576 quad adapter	2008-08-27 05:36:12 -04:00
e1000_82575.h	igb: remove three redundant functions left in the code	2008-08-07 01:55:20 -04:00
e1000_defines.h	igb: fixes 82576 serdes init to correctly support manual flow control changes	2008-08-07 01:55:09 -04:00
e1000_hw.h	igb: remove 82576 quad adapter	2008-08-27 05:36:12 -04:00
e1000_mac.c	igb: remove three redundant functions left in the code	2008-08-07 01:55:20 -04:00
e1000_mac.h	igb: remove three redundant functions left in the code	2008-08-07 01:55:20 -04:00
e1000_nvm.c
e1000_nvm.h
e1000_phy.c
e1000_phy.h
e1000_regs.h	igb: remove three redundant functions left in the code	2008-08-07 01:55:20 -04:00
igb_ethtool.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-18 23:38:23 -08:00
igb_main.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-11-18 23:38:23 -08:00
igb.h	igb: Kill CONFIG_NETDEVICES_MULTIQUEUE references, no longer exists.	2008-07-17 19:20:58 -07:00
Makefile