OpenCloudOS-Kernel/drivers/net/ethernet
David S. Miller ca1ba7caa6 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next
Conflicts:
	drivers/net/ethernet/intel/e1000e/netdev.c
2011-08-20 17:25:36 -07:00
..
3com net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
8390 net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
adaptec net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
adi net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
aeroflex net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
alteon net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
amd Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-08-20 10:39:12 -07:00
apple net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
atheros net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
broadcom Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-08-20 10:39:12 -07:00
brocade net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
cadence net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
chelsio net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
cirrus cirrus: Move the Cirrus network driver 2011-08-12 03:40:54 -07:00
cisco net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
davicom dm9000: define debug level as a module parameter 2011-08-20 14:15:55 -07:00
dec net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
dlink net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
emulex be2net: Storing the 'vid' got by the grp5 event instead of storing the vlan_tag 2011-08-18 21:51:49 -07:00
faraday ftgmac100/ftmac100: Move the Faraday drivers 2011-08-11 16:29:35 -07:00
freescale Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-08-20 10:39:12 -07:00
fujitsu net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
hp net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
i825xx net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
ibm net: fix IBM EMAC driver after rename. 2011-08-18 21:33:49 -07:00
icplus net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
intel Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next 2011-08-20 17:25:36 -07:00
marvell net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
mellanox net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
micrel net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
microchip net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
myricom net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
natsemi net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
neterion net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
nuvoton net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
nvidia Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-08-20 10:39:12 -07:00
octeon net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
oki-semi net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
packetengines net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
pasemi net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
qlogic net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
racal net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
rdc net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
realtek net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
renesas Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-08-20 10:39:12 -07:00
seeq net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
sfc net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
sgi net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
sis net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
smsc net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
stmicro net: introduce IFF_UNICAST_FLT private flag 2011-08-17 20:21:27 -07:00
sun net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
tehuti net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
ti net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
tile tile: Move the Tilera driver 2011-08-12 23:47:53 -07:00
toshiba net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
tundra net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
via Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net 2011-08-20 10:39:12 -07:00
xilinx net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
xircom net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
xscale net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
Kconfig drivers/net: Kconfig and Makefile cleanup 2011-08-13 00:44:19 -07:00
Makefile acenic: Move the Alteon driver 2011-08-13 00:37:14 -07:00
dnet.c dnet: Move the Dave Ethernet driver 2011-08-12 23:46:51 -07:00
dnet.h dnet: Move the Dave Ethernet driver 2011-08-12 23:46:51 -07:00
ethoc.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
fealnx.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
jme.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
jme.h jme: Move the JME driver 2011-08-12 03:41:22 -07:00
korina.c NET: Korina: Don't include <asm/segment.h> 2011-08-18 21:32:18 -07:00
lantiq_etop.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
mipsnet.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
netx-eth.c net: remove use of ndo_set_multicast_list in drivers 2011-08-17 20:22:03 -07:00
s6gmac.c s6gmac: Move the s6gmac drivers 2011-08-12 03:41:07 -07:00