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

..

appletalk

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

arcnet

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

bonding

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

2011-08-20 10:39:12 -07:00

caif

…

can

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

2011-08-20 10:39:12 -07:00

cris

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

ethernet

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/jkirsher/net-next

2011-08-20 17:25:36 -07:00

hamradio

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

irda

net/irda: sh_sir: tidyup compile warning

2011-08-11 05:52:57 -07:00

pcmcia

xircom: Move the Xircom driver

2011-08-12 23:47:43 -07:00

phy

dp83640: increase receive time stamp buffer size

2011-08-07 22:53:22 -07:00

skfp

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

tokenring

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

usb

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

2011-08-20 10:39:12 -07:00

vmxnet3

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

2011-08-20 10:39:12 -07:00

wan

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

wimax

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

wireless

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

2011-08-20 10:39:12 -07:00

xen-netback

…

bsd_comp.c

…

defxx.c

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

defxx.h

…

dummy.c

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

eql.c

…

ifb.c

net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared

2011-07-27 22:39:30 -07:00

Kconfig

net: Fix sungem_phy sharing.

2011-08-16 00:16:49 -07:00

LICENSE.SRC

…

loopback.c

…

macvlan.c

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

macvtap.c

…

Makefile

net: Fix sungem_phy sharing.

2011-08-16 00:16:49 -07:00

mdio.c

…

mii.c

…

netconsole.c

…

plip.c

…

ppp_async.c

…

ppp_deflate.c

…

ppp_generic.c

atomic: use <linux/atomic.h>

2011-07-26 16:49:47 -07:00

ppp_mppe.c

…

ppp_mppe.h

…

ppp_synctty.c

…

pppoe.c

…

pppox.c

…

pptp.c

…

rionet.c

…

rrunner.c

…

rrunner.h

…

sb1000.c

…

slhc.c

…

slip.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net

2011-08-07 23:20:26 -07:00

slip.h

slip: cleanup statistics generation

2011-08-03 19:12:15 -07:00

Space.c

…

sungem_phy.c

net: Fix sungem_phy sharing.

2011-08-16 00:16:49 -07:00

tun.c

net: remove use of ndo_set_multicast_list in drivers

2011-08-17 20:22:03 -07:00

veth.c

net: Audit drivers to identify those needing IFF_TX_SKB_SHARING cleared

2011-07-27 22:39:30 -07:00

virtio_net.c

net: introduce IFF_UNICAST_FLT private flag

2011-08-17 20:21:27 -07:00

xen-netfront.c

…