mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-31 09:51:31 -05:00
Code Issues Packages Projects Releases Wiki Activity
Files
efd0bf97deeddd9ba53daabfc470a1399c6b0b2d
linux/drivers/net
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
..
appletalk
net: remove use of ndo_set_multicast_list in drivers
2011-08-17 20:22:03 -07:00
arcnet
drivers/net: Kconfig & Makefile cleanup
2011-08-27 00:58:49 -07:00
bonding
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
caif
caif-hsi: Added recovery check of CA wake status.
2011-10-19 03:25:43 -04:00
can
net: remove NETIF_F_NO_CSUM feature bit
2011-11-16 17:43:12 -05:00
cris
net: remove use of ndo_set_multicast_list in drivers
2011-08-17 20:22:03 -07:00
ethernet
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
fddi
skfp: Fix SysKonnect FDDI driver compile issues
2011-08-27 00:58:23 -07:00
hamradio
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
hippi
net: drivers/net/hippi/Kconfig should be sourced
2011-11-09 15:55:06 -05:00
irda
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2011-11-03 13:28:14 -07:00
phy
net: Add ethtool to mii advertisment conversion helpers
2011-11-16 18:36:59 -05:00
plip
plip: Move the PLIP driver
2011-08-27 00:58:33 -07:00
ppp
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
2011-10-24 18:18:09 -04:00
slip
slip: Move the SLIP drivers
2011-08-27 00:58:36 -07:00
team
team: replace kmalloc+memcpy by kmemdup
2011-11-18 14:55:03 -05:00
tokenring
drivers/net: Kconfig & Makefile cleanup
2011-08-27 00:58:49 -07:00
usb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
vmxnet3
net: introduce and use netdev_features_t for device features sets
2011-11-16 17:43:10 -05:00
wan
wan: make LAPB callbacks const
2011-09-16 19:20:20 -04:00
wimax
drivers/net: Add moduleparam.h to drivers as required.
2011-10-31 19:31:09 -04:00
wireless
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
xen-netback
net: introduce and use netdev_features_t for device features sets
2011-11-16 17:43:10 -05:00
dummy.c
net: remove NETIF_F_NO_CSUM feature bit
2011-11-16 17:43:12 -05:00
eql.c
…
ifb.c
net: remove NETIF_F_NO_CSUM feature bit
2011-11-16 17:43:12 -05:00
Kconfig
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2011-11-21 13:50:33 -05:00
LICENSE.SRC
…
loopback.c
net: remove NETIF_F_NO_CSUM feature bit
2011-11-16 17:43:12 -05:00
macvlan.c
macvlan: receive multicast with local address
2011-11-04 17:39:32 -04:00
macvtap.c
macvtap: Fix the minor device number allocation
2011-10-21 02:53:07 -04:00
Makefile
net: introduce ethernet teaming device
2011-11-13 16:10:10 -05:00
mdio.c
…
mii.c
net: Add ethtool to mii advertisment conversion helpers
2011-11-16 18:36:59 -05:00
netconsole.c
netconsole: enable netconsole can make net_device refcnt incorrent
2011-10-18 23:55:29 -04:00
rionet.c
drivers/net/rionet.c: fix ethernet address macros for LE platforms
2011-11-02 16:07:01 -07:00
sb1000.c
…
Space.c
…
sungem_phy.c
net: Fix sungem_phy sharing.
2011-08-16 00:16:49 -07:00
tun.c
net: introduce and use netdev_features_t for device features sets
2011-11-16 17:43:10 -05:00
veth.c
net: remove NETIF_F_NO_CSUM feature bit
2011-11-16 17:43:12 -05:00
virtio_net.c
enable virtio_net to return bus_info in ethtool -i consistent with emulated NICs
2011-11-16 17:26:46 -05:00
xen-netfront.c
net: drivers: use bool type instead of double negation
2011-11-16 23:12:20 -05:00