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

Conflicts:
	drivers/net/wireless/iwmc3200wifi/netdev.c
	net/wireless/scan.c

2009-07-23 19:03:51 -07:00

..

core.c

net: convert remaining non-symbolic return values in ndo_start_xmit() functions

2009-07-05 19:23:38 -07:00

core.h

ibm_newemac: Fix EMAC soft reset on 460EX/GT

2008-10-08 15:27:14 -07:00

debug.c

…

debug.h

…

emac.h

…

Kconfig

Merge commit 'origin'

2008-10-15 11:31:54 +11:00

Makefile

…

mal.c

net: Add init_dummy_netdev() and fix EMAC driver using it

2009-01-14 21:05:05 -08:00

mal.h

net: Add init_dummy_netdev() and fix EMAC driver using it

2009-01-14 21:05:05 -08:00

phy.c

net: variables reach -1, but 0 tested

2009-02-02 21:39:02 -08:00

phy.h

ibm_newemac: Add support for GPCS, SGMII and M88E1112 PHY

2008-10-02 13:06:42 -04:00

rgmii.c

drivers/net: Move a dereference below a NULL test

2009-07-21 13:00:43 -07:00

rgmii.h

…

tah.c

…

tah.h

…

zmii.c

…

zmii.h

…