git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 0074820 9bbc052)

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	3c709f8fb43e07a0403bba4a8ca7ba00ab874994
tree	9efc1e2bf6930851f0224f525b6cde0f5297fa61	tree \| snapshot
parent	0074820978004cc484b132d7a9ce0df414660d9d	commit \| diff
parent	9bbc052d5e63512b0ce4e201ea97e12fba9fda82	commit \| diff

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	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

John Crispins staging tree