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

Browse source

Conflicts:

	drivers/net/usb/rndis_host.c
	drivers/net/wireless/b43/dma.c
	net/ipv6/ndisc.c

...

This commit is contained in:

David S. Miller 2008-03-27 18:48:56 -07:00

parent ed85f2c3b2 50fd4407b8

commit 8e8e43843b

76 changed files with 640 additions and 657 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

6

include/linux/netdevice.h

View file

4

include/net/neighbour.h

View file

29

include/net/xfrm.h

View file