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

Browse source

Conflicts:
	drivers/net/sfc/net_driver.h
	drivers/net/sfc/siena.c

...

This commit is contained in:

David S. Miller 2010-06-06 17:42:02 -07:00

parent e59d44df46 024a07bacf

commit eedc765ca4

49 changed files with 323 additions and 270 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

include/linux/netfilter/x_tables.h

View file

6

include/net/dst.h

View file

15

include/net/sock.h

View file