Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse source

Conflicts:
	drivers/net/vmxnet3/vmxnet3_ethtool.c
	net/core/dev.c

...

This commit is contained in:

David S. Miller 2011-05-17 17:33:11 -04:00

parent 1d1652cbdb 7cc31a9ae1

commit 9cbc94eabb

26 changed files with 173 additions and 94 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2

net/bridge/br_netfilter.c

View file

26

net/core/dev.c

View file

2

net/core/ethtool.c

View file

4

net/mac80211/tx.c

View file

2

net/netfilter/ipvs/ip_vs_app.c

View file

4

net/netfilter/ipvs/ip_vs_conn.c

View file

6

net/netfilter/ipvs/ip_vs_ctl.c

View file

16

net/netfilter/nf_conntrack_sip.c

View file

6

net/socket.c

View file