You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 3505d1a9fd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/sfc/sfe4001.c drivers/net/wireless/libertas/cmd.c drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/rtl8187se/Kconfig drivers/staging/rtl8192e/Kconfig		15 years ago
..
Kconfig	Merge commit 'origin'	17 years ago
Makefile	…
core.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
core.h	ibm_newemac: Fix EMAC soft reset on 460EX/GT	17 years ago
debug.c	…
debug.h	…
emac.h	ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts	15 years ago
mal.c	net: Add init_dummy_netdev() and fix EMAC driver using it	16 years ago
mal.h	net: Add init_dummy_netdev() and fix EMAC driver using it	16 years ago
phy.c	net: variables reach -1, but 0 tested	16 years ago
phy.h	ibm_newemac: Add support for GPCS, SGMII and M88E1112 PHY	17 years ago
rgmii.c	drivers/net: Move a dereference below a NULL test	16 years ago
rgmii.h	…
tah.c	…
tah.h	…
zmii.c	…
zmii.h	…