]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7f46cd1 130d9d5)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 30 Apr 2013 07:50:54 +0000 (03:50 -0400)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Apr 2013 07:55:20 +0000 (03:55 -0400)
commit8b8c96b26654e177b417d4cb1fe0714794102d0b
tree57f5d78524bfd5e65aa9f3943da9c1a3e6ff65b7tree | snapshot
parent7f46cd1f1e98c54a00dca52c66338739a95322aecommit | diff
parent130d9d503a8c8746090c1c62fded7ad176c76d76commit | diff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/emulex/benet/be.h
include/net/tcp.h
net/mac802154/mac802154.h

Most conflicts were minor overlapping stuff.

The be2net driver brought in some fixes that added __vlan_put_tag
calls, which in net-next take an additional argument.

Signed-off-by: David S. Miller <davem@davemloft.net>
20 files changed:
drivers/net/bonding/bond_main.c diff1 | diff2 | blob | history
drivers/net/caif/caif_spi.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h diff1 | diff2 | blob | history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be.h diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_cmds.c diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_cmds.h diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_ethtool.c diff1 | diff2 | blob | history
drivers/net/ethernet/emulex/benet/be_main.c diff1 | diff2 | blob | history
drivers/net/ethernet/freescale/gianfar_ptp.c diff1 | diff2 | blob | history
drivers/net/ethernet/realtek/r8169.c diff1 | diff2 | blob | history
drivers/net/tun.c diff1 | diff2 | blob | history
net/batman-adv/routing.c diff1 | diff2 | blob | history
net/core/datagram.c diff1 | diff2 | blob | history
net/ipv4/tcp_ipv4.c diff1 | diff2 | blob | history
net/mac802154/mac802154.h diff1 | diff2 | blob | history
net/netfilter/ipvs/ip_vs_pe_sip.c diff1 | diff2 | blob | history
net/nfc/llcp_sock.c diff1 | | blob | history
net/unix/af_unix.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.