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

Browse source

Conflicts:

	drivers/net/ehea/ehea_main.c
	drivers/net/wireless/iwlwifi/Kconfig
	drivers/net/wireless/rt2x00/rt61pci.c
	net/ipv4/inet_timewait_sock.c
	net/ipv6/raw.c
	net/mac80211/ieee80211_sta.c

...

This commit is contained in:

David S. Miller 2008-04-14 02:30:23 -07:00

parent f5572855ec 159d83363b

commit df39e8ba56

69 changed files with 835 additions and 358 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/Kbuild

View file

39

include/linux/if_tun.h

View file

2

include/linux/ipv6.h

View file