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

Conflicts:
	drivers/net/tokenring/tmspci.c
	drivers/net/ucc_geth_mii.c

2009-03-05 02:06:47 -08:00

..

am79c961a.c

[NET] am79c961a: fix spin_lock usage

2009-01-24 23:21:33 +00:00

am79c961a.h

…

at91_ether.c

…

at91_ether.h

…

ep93xx_eth.c

net: Remove redundant NAPI functions

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

ether1.c

…

ether1.h

…

ether3.c

…

ether3.h

…

etherh.c

Revert "etherh: Get working again."

2009-02-22 19:54:16 -08:00

ixp4xx_eth.c

net: Remove redundant NAPI functions

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

Kconfig

IXP4xx: Add PHYLIB support to Ethernet driver.

2008-12-22 00:42:55 +01:00

ks8695net.c

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

2009-03-05 02:06:47 -08:00

ks8695net.h

…

Makefile

Revert "etherh: Get working again."

2009-02-22 19:54:16 -08:00