git.stricted.de - GitHub/LineageOS/android_kernel_samsung

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

author	David S. Miller <davem@davemloft.net>
	Tue, 30 Apr 2013 07:50:54 +0000 (03:50 -0400)
committer	David S. Miller <davem@davemloft.net>
	Tue, 30 Apr 2013 07:55:20 +0000 (03:55 -0400)
commit	58717686cf7c7f5a70b3a8907ade8a3ce74306b1
tree	57f5d78524bfd5e65aa9f3943da9c1a3e6ff65b7	tree \| snapshot (tar.gz zip)
parent	cff63a52924c6a78fa525c67d81480c85736ff3c	commit \| diff
parent	79f632c71bea0d0864d84d6a4ce78da5a9430f5b	commit \| diff

Merge git://git./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

RSS Atom

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