David S. Miller 71a83a6db6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/rocker/rocker.c The rocker commit was two overlapping changes, one to rename the ->vport member to ->pport, and another making the bitmask expression use '1ULL' instead of plain '1'. Signed-off-by: David S. Miller <davem@davemloft.net>		2015-03-03 21:16:48 -05:00
..
appletalk	net/appletalk: LTPC needs virt_to_bus	2015-02-20 16:28:46 -05:00
arcnet	net: Kill dev_rebuild_header	2015-03-02 16:43:41 -05:00
bonding	bonding: Implement port churn-machine (AD standard 43.4.17).	2015-02-24 16:05:48 -05:00
caif	caif: remove wrong dev_net_set() call	2015-01-29 14:20:02 -08:00
can	can: kvaser_usb: Ignore spurious error events after a busoff	2015-02-04 14:07:03 +01:00
cris
dsa	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
ethernet	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
fddi	net: fddi: skfp: smt.c: Remove unused function	2015-01-02 16:36:07 -05:00
hamradio	ax25: Stop using magic neighbour cache operations.	2015-03-03 14:44:41 -05:00
hippi
hyperv	hyperv: Implement netvsc_get_channels() ethool op	2015-02-28 16:51:36 -05:00
ieee802154	at86rf230: add warning if edge-triggered irq	2015-02-27 18:42:44 +01:00
ipvlan	net: Kill dev_rebuild_header	2015-03-02 16:43:41 -05:00
irda	irda: vlsi_ir: Replace timeval with ktime_t	2015-01-11 21:39:40 -05:00
phy	amd-xgbe-phy: PHY KX/KR mode differences	2015-02-25 16:57:42 -05:00
plip
ppp	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
slip
team	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
usb	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
vmxnet3	Driver: Vmxnet3: Copy TCP header to mapped frame for IPv6 packets	2015-03-01 23:03:42 -05:00
wan	wan: cosa: replace current->state by set_current_state()	2015-02-22 15:24:10 -05:00
wimax	kbuild: remove unnecessary "obj- := dummy.o" trick	2014-10-02 13:55:02 +02:00
wireless	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
xen-netback	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
dummy.c	dummy: use MODULE_VERSION	2014-12-09 21:51:06 -05:00
eql.c	net: better IFF_XMIT_DST_RELEASE support	2014-10-07 13:22:11 -04:00
ifb.c	net: better IFF_XMIT_DST_RELEASE support	2014-10-07 13:22:11 -04:00
Kconfig	ipvlan: Fix text that talks about ip util support	2015-02-20 16:35:44 -05:00
LICENSE.SRC
loopback.c	net: better IFF_XMIT_DST_RELEASE support	2014-10-07 13:22:11 -04:00
macvlan.c	net: Kill dev_rebuild_header	2015-03-02 16:43:41 -05:00
macvtap.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2015-03-03 21:16:48 -05:00
Makefile	ipvlan: Initial check-in of the IPVLAN driver.	2014-11-24 15:29:18 -05:00
mdio.c
mii.c	mii: Handle link state changes for forced modes in mii_check_media()	2015-01-19 15:43:42 -05:00
netconsole.c	netconsole: Use eth_<foo>_addr instead of memset	2015-03-03 17:01:37 -05:00
nlmon.c
ntb_netdev.c
rionet.c
sb1000.c
Space.c
sungem_phy.c
tun.c	net: Remove iocb argument from sendmsg and recvmsg	2015-03-02 13:06:31 -05:00
veth.c	veth: advertise link netns via netlink	2015-01-23 17:51:15 -08:00
virtio_net.c	OK, this has the big virtio 1.0 implementation, as specified by OASIS.	2015-02-18 09:24:01 -08:00
vxlan.c	vxlan: Use checksum partial with remote checksum offload	2015-02-11 15:12:13 -08:00
xen-netfront.c	xen-netfront: Use static attribute groups for sysfs entries	2015-02-05 00:31:12 -08:00