projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 785c20a 69204cf)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Wed, 10 Dec 2014 20:48:20 +0000 (15:48 -0500)
committerDavid S. Miller <davem@davemloft.net>
Wed, 10 Dec 2014 20:48:20 +0000 (15:48 -0500)
commit22f10923dd39141785273e423b9acf347297e15f
treecc1f19103817433a426b3e329d6326f5e9d8e8f7tree
parent785c20a08bead1e58ad53f2dc324782da7a0c9eacommit | diff
parent69204cf7eb9c5a72067ce6922d4699378251d053commit | diff
Merge git://git./linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/amd/xgbe/xgbe-desc.c
drivers/net/ethernet/renesas/sh_eth.c

Overlapping changes in both conflict cases.

Signed-off-by: David S. Miller <davem@davemloft.net>
20 files changed:
arch/x86/net/bpf_jit_comp.c diff1 | diff2 | blob | history
drivers/net/bonding/bond_netlink.c diff1 | diff2 | blob | history
drivers/net/ethernet/amd/xgbe/xgbe-desc.c diff1 | diff2 | blob | history
drivers/net/ethernet/amd/xgbe/xgbe-drv.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/mvneta.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/pxa168_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/marvell/sky2.c diff1 | diff2 | blob | history
drivers/net/ethernet/renesas/sh_eth.c diff1 | diff2 | blob | history
drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c diff1 | diff2 | blob | history
drivers/net/xen-netfront.c diff1 | diff2 | blob | history
include/uapi/linux/Kbuild diff1 | diff2 | blob | history
net/core/rtnetlink.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/ipv6/tcp_ipv6.c diff1 | diff2 | blob | history
net/openvswitch/flow_netlink.c diff1 | diff2 | blob | history
net/sched/Kconfig diff1 | diff2 | blob | history
MicroBlaze GIT Repository