tree b11b67b20f823125597c2a8f726b677f3cab4b26
parent a9de0500083c18589ba2ea4543135c1bea8419ec
parent 6153871f77f8fa778cd0cf1e2979db75e25d3532
author David S. Miller <davem@davemloft.net> 1399668413 -0400
committer David S. Miller <davem@davemloft.net> 1399668413 -0400

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

John W. Linville says:

====================
pull request: wireless 2014-05-08

This one is all from Johannes:

"Here are a few small fixes for the current cycle: radiotap TX flags were
wrong (fix by Bob), Chun-Yeow fixes an SMPS issue with mesh interfaces,
Eliad fixes a locking bug and a cfg80211 state problem and finally
Henning sent me a fix for IBSS rate information."

Please let me know if there are problems!
====================

Signed-off-by: David S. Miller <davem@davemloft.net>