Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Wed, 2 Dec 2009 06:13:38 +0000 (22:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 Dec 2009 06:13:38 +0000 (22:13 -0800)
commitff9c38bba37937adb909cceb2a6521f2e92e17c6
tree93bd6152d9fa28348be99ef1c788040cc7b7a94d
parent65c0cfafce9575319fb6f70080fbe226e5617e3b
parentb2722b1c3a893ec6021508da15b32282ec79f4da
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
net/mac80211/ht.c
16 files changed:
MAINTAINERS
drivers/net/e100.c
drivers/net/r8169.c
drivers/net/smc91x.c
drivers/net/smsc9420.c
drivers/net/wan/cosa.c
drivers/net/wireless/iwlwifi/iwl-tx.c
include/net/mac80211.h
net/ipv4/ip_fragment.c
net/ipv4/ip_output.c
net/ipv4/tcp.c
net/mac80211/agg-rx.c
net/mac80211/agg-tx.c
net/mac80211/ht.c
net/mac80211/ieee80211_i.h
net/xfrm/xfrm_algo.c