Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-07 12:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
efd0bf97de
linux/drivers/net/ethernet
History
David S. Miller efd0bf97de Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
The forcedeth changes had a conflict with the conversion over
to atomic u64 statistics in net-next.

The libertas cfg.c code had a conflict with the bss reference
counting fix by John Linville in net-next.

Conflicts:
	drivers/net/ethernet/nvidia/forcedeth.c
	drivers/net/wireless/libertas/cfg.c
2011-11-21 13:50:33 -05:00
..
3com sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
8390 ethernet: Convert ETHER_ADDR_LEN uses to ETH_ALEN 2011-11-16 20:23:17 -05:00
adaptec sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
adi
aeroflex
alteon
amd amd8111e: Convert ETH_ADDR_LEN uses to ETH_ALEN 2011-11-16 20:23:18 -05:00
apple
atheros net: introduce and use netdev_features_t for device features sets 2011-11-16 17:43:10 -05:00
broadcom Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
brocade bna: Convert MAC_ADDRLEN uses to ETH_ALEN 2011-11-16 20:23:18 -05:00
cadence net/cadence: enable by default NET_ATMEL 2011-11-16 17:33:50 -05:00
chelsio net: introduce and use netdev_features_t for device features sets 2011-11-16 17:43:10 -05:00
cirrus
cisco Sweep the last of the active .get_drvinfo floors under ethernet/ 2011-11-14 14:13:31 -05:00
davicom net: introduce and use netdev_features_t for device features sets 2011-11-16 17:43:10 -05:00
dec sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
dlink sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
emulex be2net: Use V1 query link status command for lancer 2011-11-16 18:07:10 -05:00
faraday
freescale ucc_geth: Convert ENET_NUM_OCTETS_PER_ADDRESS uses to ETH_ALEN 2011-11-16 20:23:18 -05:00
fujitsu net: sweep-up some straglers in strlcpy conversion of .get_drvinfo routines 2011-11-16 17:38:55 -05:00
hp
i825xx sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
ibm ibm/emac: fix improper cleanup when device is removed to allow re-bind 2011-11-17 17:04:57 -05:00
icplus
intel Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 2011-11-16 18:31:56 -05:00
marvell Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
mellanox Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
micrel ethernet: Convert MAC_ADDR_LEN uses to ETH_ALEN 2011-11-16 20:23:17 -05:00
microchip
myricom net: introduce and use netdev_features_t for device features sets 2011-11-16 17:43:10 -05:00
natsemi sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
neterion net: introduce and use netdev_features_t for device features sets 2011-11-16 17:43:10 -05:00
nuvoton
nvidia Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
octeon
oki-semi Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
packetengines
pasemi
qlogic net: introduce and use netdev_features_t for device features sets 2011-11-16 17:43:10 -05:00
racal
rdc r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list 2011-11-16 20:24:52 -05:00
realtek ethernet: Convert MAC_ADDR_LEN uses to ETH_ALEN 2011-11-16 20:23:17 -05:00
renesas
seeq
sfc net: introduce and use netdev_features_t for device features sets 2011-11-16 17:43:10 -05:00
sgi
silan
sis ethernet: Convert MAC_ADDR_LEN uses to ETH_ALEN 2011-11-16 20:23:17 -05:00
smsc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
stmicro Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
sun net: Add ethtool to mii advertisment conversion helpers 2011-11-16 18:36:59 -05:00
tehuti
ti
tile
toshiba
tundra
via Sweep additional floors of strcpy in .get_drvinfo routines 2011-11-14 00:35:46 -05:00
xilinx Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2011-11-21 13:50:33 -05:00
xircom sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
xscale
dnet.c sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
dnet.h
ethoc.c
fealnx.c sweep the floors and convert some .get_drvinfo routines to strlcpy 2011-11-08 15:11:57 -05:00
jme.c net: drivers: use bool type instead of double negation 2011-11-16 23:12:20 -05:00
jme.h
Kconfig
korina.c
lantiq_etop.c NET: MIPS: lantiq: fix etop compile error 2011-11-14 14:34:54 -05:00
Makefile
mipsnet.c
netx-eth.c
s6gmac.c