git.stricted.de - GitHub/MotorolaMobilityLLC/kernel-slsi.git/commit

author	David S. Miller <davem@davemloft.net>
	Fri, 7 Oct 2011 17:38:43 +0000 (13:38 -0400)
committer	David S. Miller <davem@davemloft.net>
	Fri, 7 Oct 2011 17:38:43 +0000 (13:38 -0400)
commit	88c5100c28b02c4b2b2c6f6fafbbd76d90f698b9
tree	08c4399e0341f7eb0ccb24e15f2cab687275c2a4	tree \| snapshot (tar.gz zip)
parent	8083f0fc969d9b5353061a7a6f963405057e26b1	commit \| diff
parent	3ee72ca99288f1de95ec9c570e43f531c8799f06	commit \| diff

Merge branch 'master' of github.com:davem330/net

Conflicts:
net/batman-adv/soft-interface.c

21 files changed:

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/l2t.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/l2t.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/ibm/ibmveth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c	diff1 \|	\|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/dp83640.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_device.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history

Motorola kernel-slsi

Documentation/networking/ip-sysctl.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/l2t.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/chelsio/cxgb3/l2t.h	diff1 \|	\|	blob \| history
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/ibm/ibmveth.c	diff1 \|	\|	blob \| history
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c	diff1 \|	\|	blob \| history
drivers/net/macvlan.c	diff1 \|	diff2 \|	blob \| history
drivers/net/phy/dp83640.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci.h	diff1 \|	diff2 \|	blob \| history
net/batman-adv/soft-interface.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_device.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_input.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/tcp_ipv4.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history