Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-3.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 11 May 2011 18:26:15 +0000 (14:26 -0400)
committerDavid S. Miller <davem@davemloft.net>
Wed, 11 May 2011 18:26:58 +0000 (14:26 -0400)
commit3c709f8fb43e07a0403bba4a8ca7ba00ab874994
tree9efc1e2bf6930851f0224f525b6cde0f5297fa61
parent0074820978004cc484b132d7a9ce0df414660d9d
parent9bbc052d5e63512b0ce4e201ea97e12fba9fda82
Merge branch 'master' of /linux/kernel/git/davem/net-3.6

Conflicts:
drivers/net/benet/be_main.c
15 files changed:
drivers/net/benet/be.h
drivers/net/benet/be_cmds.c
drivers/net/benet/be_main.c
drivers/net/ehea/ehea_ethtool.c
drivers/net/pch_gbe/pch_gbe_main.c
drivers/net/vmxnet3/vmxnet3_drv.c
include/net/ip_vs.h
include/net/xfrm.h
net/8021q/vlan.c
net/8021q/vlan_dev.c
net/core/dev.c
net/ipv4/xfrm4_state.c
net/netfilter/ipvs/ip_vs_ctl.c
net/netfilter/x_tables.c
net/xfrm/xfrm_policy.c