Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
David S. Miller [Wed, 27 Mar 2013 17:52:49 +0000 (13:52 -0400)]
Conflicts:
include/net/ipip.h

The changes made to ipip.h in 'net' were already included
in 'net-next' before that header was moved to another location.

Signed-off-by: David S. Miller <davem@davemloft.net>

1  2 
MAINTAINERS
drivers/infiniband/hw/cxgb4/qp.c
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c
drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
net/bridge/br_fdb.c
net/core/dev.c
net/ipv4/tcp_input.c
net/ipv6/addrconf.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
diff --cc net/core/dev.c
Simple merge
Simple merge
Simple merge