David S. Miller b05930f5d1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/wireless/iwlwifi/pcie/trans.c include/linux/inetdevice.h The inetdevice.h conflict involves moving the IPV4_DEVCONF values into a UAPI header, overlapping additions of some new entries. The iwlwifi conflict is a context overlap. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-08-26 16:37:08 -04:00
..
appletalk
arcnet	arcnet: cleanup sizeof parameter	2013-07-19 17:36:03 -07:00
bonding	bonding: fix error return code in bond_enslave()	2013-08-25 18:37:35 -04:00
caif	drivers/net: caif: fix wrong rtnl_is_locked() usage	2013-07-09 12:55:48 -07:00
can	can: flexcan: use platform_set_drvdata()	2013-08-22 09:40:20 +02:00
cris
dsa
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
fddi
hamradio
hippi
hyperv	hyperv: Fix the NETIF_F_SG flag setting in netvsc	2013-07-16 23:02:24 -07:00
ieee802154	drivers/net/ieee802154: don't use devm_pinctrl_get_select_default() in probe	2013-07-11 17:18:27 -07:00
irda	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
phy	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
plip
ppp	pptp: fix byte order warnings	2013-08-13 15:10:22 -07:00
slip
team	team: cleanup netpoll clode	2013-07-26 15:24:32 -07:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
vmxnet3
wan	net: wan: sbni: Fix incorrect placement of __initdata	2013-08-09 13:24:26 -07:00
wimax
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
xen-netback	xen-netback: xenbus.c: use more current logging styles	2013-07-02 00:52:55 -07:00
dummy.c	dummy: fix oops when loading the dummy failed	2013-07-11 11:59:20 -07:00
eql.c
ifb.c	ifb: fix oops when loading the ifb failed	2013-07-11 12:00:05 -07:00
Kconfig
LICENSE.SRC
loopback.c
macvlan.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-16 15:37:26 -07:00
macvtap.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-08-26 16:37:08 -04:00
Makefile
mdio.c
mii.c
netconsole.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-07-09 18:24:39 -07:00
nlmon.c	nlmon: use standard rtnetlink link api for add/del devices	2013-07-02 12:53:17 -07:00
ntb_netdev.c
rionet.c	rapidio/rionet: rework driver initialization and removal	2013-07-03 16:08:04 -07:00
sb1000.c
Space.c
sungem_phy.c
tun.c	tun: Get skfilter layout	2013-08-21 12:21:45 -07:00
veth.c	veth: add vlan features	2013-07-19 17:36:03 -07:00
virtio_net.c	virtio-net: put virtio net header inline with data	2013-07-27 20:06:10 -07:00
vxlan.c	vxlan: using kfree_rcu() to simplify the code	2013-08-20 15:05:03 -07:00
xen-netfront.c	xen-netfront: pull on receive skb may need to happen earlier	2013-07-17 12:51:19 -07:00