git.stricted.de - GitHub/LineageOS/android_kernel_motorola

projects / GitHub / LineageOS / android_kernel_motorola_exynos9610.git / commit

author	David S. Miller <davem@davemloft.net>
	Wed, 18 Dec 2013 21:42:06 +0000 (16:42 -0500)
committer	David S. Miller <davem@davemloft.net>
	Wed, 18 Dec 2013 21:42:06 +0000 (16:42 -0500)
commit	143c9054949436cb05e468439dc5e46231f33d09
tree	c2e972d8188fb1b36368e9acb5b6b59466c9d903	tree \| snapshot (tar.gz zip)
parent	0b6807034791160d5e584138943d2daea765436d	commit \| diff
parent	35eecf052250f663f07a4cded7d3503fd1b50729	commit \| diff

Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/intel/i40e/i40e_main.c
drivers/net/macvtap.c

Both minor merge hassles, simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

33 files changed:

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/smsc/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvtap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/netback.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/structs.h	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_htb.c	diff1 \|	diff2 \|	blob \| history
net/sctp/associola.c	diff1 \|	diff2 \|	blob \| history
net/sctp/output.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sysctl.c	diff1 \|	diff2 \|	blob \| history
net/tipc/core.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/tg3.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/freescale/fec_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/intel/i40e/i40e_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/smsc/smc91x.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/ti/cpsw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/hyperv/netvsc_drv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/macvtap.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/micrel.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tun.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vxlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.c	diff1 \|	diff2 \|	blob \| history
drivers/net/xen-netback/netback.c	diff1 \|	diff2 \|	blob \| history
include/linux/netdevice.h	diff1 \|	diff2 \|	blob \| history
include/net/sctp/structs.h	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/sched/sch_htb.c	diff1 \|	diff2 \|	blob \| history
net/sctp/associola.c	diff1 \|	diff2 \|	blob \| history
net/sctp/output.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sm_statefuns.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/sctp/sysctl.c	diff1 \|	diff2 \|	blob \| history
net/tipc/core.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history