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

Conflicts:
	drivers/net/e1000/e1000_main.c

2009-01-30 14:31:07 -08:00

..

21142.c

tulip: fix 21142 with 10Mbps without negotiation

2009-01-29 17:35:04 -08:00

de4x5.c

de4x5: convert to net_device_ops

2009-01-07 18:00:31 -08:00

de4x5.h

de4x5: Remove developer debug feature about set/clear promisc

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

de2104x.c

de2104x: convert to net_device_ops

2009-01-07 17:59:47 -08:00

dmfe.c

dmfe: convert to new API

2009-01-07 18:01:20 -08:00

eeprom.c

netdevice: safe convert to netdev_priv() #part-3

2008-11-12 23:38:36 -08:00

interrupt.c

net: Remove redundant NAPI functions

2009-01-21 14:33:50 -08:00

Kconfig

remove the obsolete xircom_tulip_cb driver

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

Makefile

remove the obsolete xircom_tulip_cb driver

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

media.c

drivers/net/tulip: update first comment in tulip files

2008-06-24 22:59:26 -04:00

pnic2.c

drivers/net/tulip: update first comment in tulip files

2008-06-24 22:59:26 -04:00

pnic.c

drivers/net/tulip: update first comment in tulip files

2008-06-24 22:59:26 -04:00

timer.c

drivers/net/tulip: update first comment in tulip files

2008-06-24 22:59:26 -04:00

tulip_core.c

tulip: convert devices to new API

2009-01-07 17:59:15 -08:00

tulip.h

drivers/net/tulip: update first comment in tulip files

2008-06-24 22:59:26 -04:00

uli526x.c

uli526x: convert devices to new API

2009-01-07 18:01:40 -08:00

winbond-840.c

windbond: convert devices to new API

2009-01-07 18:02:26 -08:00

xircom_cb.c

xircom: convert devices to new API

2009-01-07 18:00:55 -08:00