git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8681b62 8e2285b)

author	David S. Miller <davem@davemloft.net>
	Wed, 11 May 2011 18:26:15 +0000 (14:26 -0400)
committer	David S. Miller <davem@davemloft.net>
	Wed, 11 May 2011 18:26:58 +0000 (14:26 -0400)
commit	6dc09b2f8717d61e9efb17ed9ffa42907f8103b5
tree	9efc1e2bf6930851f0224f525b6cde0f5297fa61	tree \| snapshot
parent	8681b62439f13f5cf06cc86c4e3cda6d2c84b528	commit \| diff
parent	8e2285b6be3ad91c4cc9c8bcccf273fa20939454	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ehea/ehea_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pch_gbe/pch_gbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/vmxnet3/vmxnet3_drv.c	diff1 \|	diff2 \|	blob \| history
include/net/ip_vs.h	diff1 \|	diff2 \|	blob \| history
include/net/xfrm.h	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan.c	diff1 \|	diff2 \|	blob \| history
net/8021q/vlan_dev.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/xfrm4_state.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/ipvs/ip_vs_ctl.c	diff1 \|	diff2 \|	blob \| history
net/netfilter/x_tables.c	diff1 \|	diff2 \|	blob \| history
net/xfrm/xfrm_policy.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.