Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Tue, 15 Jul 2008 03:23:54 +0000 (20:23 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 15 Jul 2008 03:23:54 +0000 (20:23 -0700)
commit2aec609fb45e84d65bc8eabc7b650bbecb1cc179
treeeb3e8a79604113392d0ee74b19dbc1dfce579c11
parent4c8894980010536915c4f5513ee180e3614aeca9
parent9076689ab07974a6f5d230fc241448f7a77e9078
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:

net/netfilter/nf_conntrack_proto_tcp.c
14 files changed:
Documentation/networking/ip-sysctl.txt
drivers/net/tun.c
drivers/net/wireless/libertas/scan.c
drivers/net/wireless/rt2x00/rt2400pci.c
drivers/net/wireless/rt2x00/rt2500pci.c
drivers/net/wireless/rt2x00/rt2500usb.c
drivers/net/wireless/rt2x00/rt61pci.c
drivers/net/wireless/rt2x00/rt73usb.c
drivers/net/wireless/zd1211rw/zd_mac.c
net/ipv4/fib_trie.c
net/ipv6/exthdrs.c
net/mac80211/rc80211_pid.h
net/mac80211/rc80211_pid_algo.c
net/netfilter/nf_conntrack_proto_tcp.c