Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Tue, 29 Jan 2013 20:32:13 +0000 (15:32 -0500)
committerDavid S. Miller <davem@davemloft.net>
Tue, 29 Jan 2013 20:32:13 +0000 (15:32 -0500)
commitf1e7b73acc26e8908af783bcd3a9900fd80688f5
tree9a9382fb7f12f1889020efb4bffa3f4a88589fc5
parent218774dc341f219bfcf940304a081b121a0e8099
parentfc16e884a2320198b8cb7bc2fdcf6b4485e79709
Merge git://git./linux/kernel/git/davem/net

Bring in the 'net' tree so that we can get some ipv4/ipv6 bug
fixes that some net-next work will build upon.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 files changed:
MAINTAINERS
drivers/net/can/c_can/c_can.c
drivers/net/can/ti_hecc.c
drivers/net/ethernet/calxeda/xgmac.c
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
drivers/net/ethernet/mellanox/mlx4/en_tx.c
drivers/net/ethernet/mellanox/mlx4/main.c
drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/hyperv/netvsc_drv.c
drivers/net/macvlan.c
drivers/net/tun.c
drivers/net/usb/cdc_ncm.c
drivers/net/usb/dm9601.c
drivers/net/virtio_net.c
net/batman-adv/distributed-arp-table.c
net/ipv4/ip_gre.c
net/ipv4/tcp_ipv4.c
net/ipv4/udp.c
net/ipv6/ip6_output.c
net/ipv6/ip6mr.c