David S. Miller e40051d134 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/qlcnic/qlcnic_init.c
	net/ipv4/ip_output.c

2010-09-27 01:03:03 -07:00

..

21142.c

tulip/21142.c: Use dev_<level> and pr_<level>

2010-01-31 23:26:52 -08:00

de4x5.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

de4x5.h

de4x5: Remove developer debug feature about set/clear promisc

2008-07-22 16:09:09 -04:00

de2104x.c

de2104x: fix TP link detection

2010-09-26 15:51:55 -07:00

dmfe.c

drivers/net: Remove address use from assignments of function pointers

2010-08-25 15:35:43 -07:00

eeprom.c

drivers/net/tulip/eeprom.c: Remove unnecessary kmalloc casts

2010-06-01 00:15:53 -07:00

interrupt.c

tulip: use integrated netdev stats

2010-09-03 09:44:51 -07:00

Kconfig

dmfe/tulip: Let dmfe handle DM910x except for SPARC on-board chips

2010-01-07 17:27:31 -08:00

Makefile

remove the obsolete xircom_tulip_cb driver

2008-03-17 07:49:23 -04:00

media.c

drivers/net: Remove unnecessary returns from void function()s

2010-05-14 00:19:28 -07:00

pnic2.c

tulip/pnic2.c: Use dev_<level> and pr_<level>

2010-01-31 23:26:56 -08:00

pnic.c

net: trans_start cleanups

2010-05-10 05:01:31 -07:00

timer.c

tulip/timer.c: Use dev_<level> and pr_<level>

2010-01-31 23:26:56 -08:00

tulip_core.c

tulip: use integrated netdev stats

2010-09-03 09:44:51 -07:00

tulip.h

tulip: use integrated netdev stats

2010-09-03 09:44:51 -07:00

uli526x.c

drivers/net: return operator cleanup

2010-09-26 18:34:29 -07:00

winbond-840.c

drivers/net: Remove address use from assignments of function pointers

2010-08-25 15:35:43 -07:00

xircom_cb.c

ethtool: Provide a default implementation of ethtool_ops::get_drvinfo

2010-08-17 02:31:15 -07:00