Keeping the fixes rolling:
1) Two DCCP bug fixes from Gerrit and the DCCP crew.
2) Merge in wireless fixes from John Linville and co.
3) LLC double ref bug fix from Arnaldo.
4) Netfilter conntrack expection fix from Alexey Dobriyan.
Please pull, thanks a lot!
The following changes since commit 289c79a4bd350e8a25065102563ad1a183d1b402:
Patrick McHardy (1):
vlan: Use bitmask of feature flags instead of seperate feature bits
are available in the git repository at:
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6.git master
Abhijeet Kolekar (1):
mac80211 : Fixes the status message for iwconfig
Alexey Dobriyan (1):
netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()
Andrea Merello (3):
rtl8180: fix wrong parameter in sa2400_rf_set_channel
rtl8180: fix wrong parameter in max2820_rf_set_channel
rtl8180: fix wrong parameter in grf5101_rf_set_channel
Arjan van de Ven (1):
bluetooth: fix locking bug in the rfcomm socket cleanup handling
Arnaldo Carvalho de Melo (1):
llc: Fix double accounting of received packets
David S. Miller (1):
Merge branch 'master' of master.kernel.org:/.../linville/wireless-2.6
Gerrit Renker (1):
dccp ccid-3: Fix "t_ipi explosion" bug
Guy Cohen (2):
iwlwifi: fix exit from stay_in_table state
iwlwifi: fix rate scale TLC column selection bug
Ivo van Doorn (4):
rt2x00: Fix memleak in tx() path
rt2x00: Don't count retries as failure
rt2x00: Reset antenna RSSI after switch
rt2x00: Use atomic interface iteration in irq context
John W. Linville (1):
rtl8180: avoid NULL dereference in max2820_rf_set_channel
Jussi Kivilinna (1):
rndis_wlan: add missing range check for power_output modparam
Michael Buesch (2):
b43: Upload both beacon templates on initial load
b43: Fix controller restart crash
Nicolas Kaiser (1):
net/mac80211: always true ...
