]> err.no Git - linux-2.6/commit
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Sun, 6 Jul 2008 06:08:07 +0000 (23:08 -0700)
committerDavid S. Miller <davem@davemloft.net>
Sun, 6 Jul 2008 06:08:07 +0000 (23:08 -0700)
commitea2aca084ba82aaf7c148d04914ceed8758ce08a
treedcb3f4f849cf48deac2dd3bafd5c2cd2f0e7dc79
parentf3032be921cd126615ce3bfd7084e3d319f3f892
parentc5a78ac00c400df29645e59938700301efb371d0
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

Documentation/feature-removal-schedule.txt
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
23 files changed:
Documentation/feature-removal-schedule.txt
Documentation/networking/ip-sysctl.txt
MAINTAINERS
drivers/net/forcedeth.c
drivers/net/wan/hdlc_fr.c
drivers/net/wireless/hostap/hostap_80211_rx.c
drivers/net/wireless/hostap/hostap_ap.c
drivers/net/wireless/hostap/hostap_hw.c
drivers/net/wireless/hostap/hostap_main.c
drivers/net/wireless/iwlwifi/iwl-3945.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
drivers/net/wireless/iwlwifi/iwl4965-base.c
drivers/net/wireless/libertas/if_usb.c
include/net/mac80211.h
net/bridge/br_if.c
net/core/dev.c
net/core/fib_rules.c
net/ipv4/tcp.c
net/mac80211/wext.c
net/mac80211/wme.c
net/netfilter/nf_conntrack_proto_tcp.c
net/netlink/af_netlink.c
net/sched/sch_htb.c