git.stricted.de - GitHub/moto-9609/android_kernel_motorola_exynos9610.git/commit

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2046215 f159067)

author	David S. Miller <davem@davemloft.net>
	Wed, 24 Jun 2015 09:58:51 +0000 (02:58 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 24 Jun 2015 09:58:51 +0000 (02:58 -0700)
commit	3a07bd6fead4f00f67b1bf5f551e686661c4f52c
tree	f8b8f257d928a9ae1aeb3fdbe748f03f1012f02e	tree \| snapshot (tar.gz zip)
parent	204621551b2a0060a013b92f7add4d5c452fa7cb	commit \| diff
parent	f1590670ce069eefeb93916391a67643e6ad1630	commit \| diff

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

Conflicts:
drivers/net/ethernet/mellanox/mlx4/main.c
net/packet/af_packet.c

Both conflicts were cases of simple overlapping changes.

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

14 files changed:

drivers/net/ethernet/freescale/fs_enet/fs_enet-main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/marvell/mvneta.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/mellanox/mlx4/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/rocker/rocker.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/can/af_can.c	diff1 \|	diff2 \|	blob \| history
net/core/neighbour.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/af_inet.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_sockglue.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/key.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history
net/rose/af_rose.c	diff1 \|	diff2 \|	blob \| history