projects / linux-drm-fsl-dcu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: b6a0e72 03d84a5)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 12 Jan 2016 04:55:43 +0000 (23:55 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 12 Jan 2016 04:55:43 +0000 (23:55 -0500)
commit9d367eddf363553c7668ba92c3b9d187ec4f71f7
tree4f06d334d316390cc9a869ce3e74ec48d32ed0f8tree | snapshot
parentb6a0e72ad3cffabaf30b856deb58fbe64a0f36a8commit | diff
parent03d84a5f83a67e692af00a3d3901e7820e3e84d5commit | diff
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/ethernet/mellanox/mlxsw/spectrum.h
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

The bond_main.c and mellanox switch conflicts were cases of
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
20 files changed:
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum.h diff1 | diff2 | blob | history
drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/ravb_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.c diff1 | diff2 | blob | history
drivers/net/geneve.c diff1 | diff2 | blob | history
drivers/net/phy/micrel.c diff1 | diff2 | blob | history
drivers/net/usb/lan78xx.c diff1 | diff2 | blob | history
drivers/net/usb/qmi_wwan.c diff1 | diff2 | blob | history
drivers/net/usb/r8152.c diff1 | diff2 | blob | history
drivers/net/vxlan.c diff1 | diff2 | blob | history
net/batman-adv/bat_iv_ogm.c diff1 | diff2 | blob | history
net/core/pktgen.c diff1 | diff2 | blob | history
net/ipv4/ip_output.c diff1 | diff2 | blob | history
net/ipv4/udp_offload.c diff1 | diff2 | blob | history
net/ipv6/ip6_output.c diff1 | diff2 | blob | history
net/ipv6/tcp_ipv6.c diff1 | diff2 | blob | history
net/sctp/sm_sideeffect.c diff1 | diff2 | blob | history
net/sctp/sysctl.c diff1 | diff2 | blob | history
net/unix/af_unix.c diff1 | diff2 | blob | history
Freescale DCU DRM driver