projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 17f901e 7c764ce)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Sat, 1 Aug 2015 06:52:20 +0000 (23:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sat, 1 Aug 2015 06:52:20 +0000 (23:52 -0700)
commit5510b3c2a173921374ec847848fb20b98e1c698a
treec9e185281ef17280ce0dc30be7923124874736b0tree | snapshot
parent17f901e8915cb922c2ca710835ef34f166f53ee9commit | diff
parent7c764cec3703583247c4ab837c652975a3d41f4bcommit | diff
Merge git://git./linux/kernel/git/davem/net

Conflicts:
arch/s390/net/bpf_jit_comp.c
drivers/net/ethernet/ti/netcp_ethss.c
net/bridge/br_multicast.c
net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
29 files changed:
MAINTAINERS diff1 | diff2 | blob | history
arch/x86/net/bpf_jit_comp.c diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb.c diff1 | diff2 | blob | history
drivers/net/ethernet/cadence/macb.h diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/fec_ptp.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/gianfar.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/gianfar.h diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/gianfar_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/en_rx.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlx4/main.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/netcp_core.c diff1 | diff2 | blob | history
drivers/net/ethernet/ti/netcp_ethss.c diff1 | diff2 | blob | history
drivers/net/usb/r8152.c diff1 | diff2 | blob | history
include/net/act_api.h diff1 | diff2 | blob | history
include/net/ip_fib.h diff1 | diff2 | blob | history
include/net/sock.h diff1 | diff2 | blob | history
net/bridge/br_mdb.c diff1 | diff2 | blob | history
net/bridge/br_multicast.c diff1 | diff2 | blob | history
net/bridge/br_netlink.c diff1 | diff2 | blob | history
net/ipv4/arp.c diff1 | diff2 | blob | history
net/ipv4/fib_semantics.c diff1 | diff2 | blob | history
net/ipv4/ip_fragment.c diff1 | diff2 | blob | history
net/ipv4/route.c diff1 | diff2 | blob | history
net/ipv6/ndisc.c diff1 | diff2 | blob | history
net/packet/af_packet.c diff1 | diff2 | blob | history
net/sched/act_api.c diff1 | diff2 | blob | history
net/sched/act_bpf.c diff1 | diff2 | blob | history
net/sched/act_pedit.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.