Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
commite1703b36c358dde24ececba4fd609ecd91433ba3
authorDavid S. Miller <davem@davemloft.net>
Tue, 27 Apr 2010 19:49:13 +0000 (27 12:49 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 27 Apr 2010 19:49:13 +0000 (27 12:49 -0700)
treed59c333d0ad5bf72f165264eba6048c87fdc4e0f
parent7ec75c582e639d956ce3afd499f67febe6f902a4
parente95ef5d3f6bc60433883e1ef65dac747acd0bf1a
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/e100.c
drivers/net/e1000e/netdev.c
19 files changed:
drivers/net/Makefile
drivers/net/e100.c
drivers/net/e1000e/82571.c
drivers/net/e1000e/e1000.h
drivers/net/e1000e/netdev.c
drivers/net/gianfar.c
drivers/net/ixgbe/ixgbe_82599.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/ixgbe/ixgbe_type.h
drivers/net/ks8851.c
drivers/net/r8169.c
drivers/net/tg3.c
net/core/rtnetlink.c
net/ipv4/inet_connection_sock.c
net/ipv6/inet6_connection_sock.c
net/ipv6/ip6_output.c
net/ipv6/xfrm6_policy.c
net/rds/rdma_transport.c
net/x25/af_x25.c