]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6dc09b2f8717d61e9efb17ed9ffa42907f8103b5
tree9efc1e2bf6930851f0224f525b6cde0f5297fa61
parent8681b62439f13f5cf06cc86c4e3cda6d2c84b528
parent8e2285b6be3ad91c4cc9c8bcccf273fa20939454
Merge branch 'master' of master.kernel.org:/pub/scm/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