aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAge
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-12-06
|\
| * cfg80211: fix channel error on mesh joinMarco Porsch2012-12-03
| * mac80211: return if CSA is not handleSimon Wunderlich2012-12-03
| * mac80211: simplify loop in minstrel_htJohannes Berg2012-11-30
| * cfg80211: fix BSS struct IE access racesJohannes Berg2012-11-30
| * mac80211: remove probe response temporary buffer allocationJohannes Berg2012-11-30
| * mac80211: make ieee80211_build_preq_ies saferJohannes Berg2012-11-30
| * cfg80211: fix cmp_hidden_bssJohannes Berg2012-11-30
| * cfg80211: fix whitespace in scan handlingJohannes Berg2012-11-30
| * cfg80211: don't BUG_ON BSS struct issuesJohannes Berg2012-11-30
| * mac80211: allow userspace registration for probe requests in IBSSAntonio Quartulli2012-11-30
| * mac80211: fix for mesh sync to indicate TBTT adjustmentMarco Porsch2012-11-30
| * nl80211: Fix HT_IBSS feature check in ibss_joinSimon Wunderlich2012-11-29
| * mac80211: add debugfs file for last rx rateSaravana2012-11-29
| * mac80211: re-organize the rx rate calculation logicSaravana2012-11-29
| * mac80211: add debugfs file for current tx rateSaravana2012-11-29
| * mac80211: add debugfs file for last ack signalSaravana2012-11-29
| * cfg80211: Remove unused VHT chan codeMahesh Palivela2012-11-29
| * mac80211: don't reinit rate control when mesh sta existsHelmut Schaa2012-11-28
| * mac80211: reject setting masked mac addressesHelmut Schaa2012-11-28
| * mac80211: fix potential NULL dereferenceDan Carpenter2012-11-28
| * nl80211: remove unnecessary checksJohannes Berg2012-11-28
| * mac80211: support P2P GO powersave configurationJohannes Berg2012-11-27
| * nl80211: support P2P GO powersave configurationJohannes Berg2012-11-27
| * mac80211: support (partial) VHT radiotap informationJohannes Berg2012-11-27
| * mac80211: support VHT associationJohannes Berg2012-11-27
| * cfg80211: rework chandef checking and export itJohannes Berg2012-11-27
* | Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-12-06
|\ \
| * | NFC: Fix incorrect llcp pointer dereferenceWaldemar Rymarkiewicz2012-11-28
| * | mac80211: fix remain-on-channel (non-)cancellingJohannes Berg2012-11-26
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-12-03
|\ \ \
| * | | Revert "Bluetooth: Fix possible deadlock in SCO code"Gustavo Padovan2012-12-03
| * | | Bluetooth: trivial: Change NO_FCS_RECV to RECV_NO_FCSAndrei Emeltchenko2012-12-03
| * | | Bluetooth: Process receiving FCS_NONE in L2CAP Conf RspAndrei Emeltchenko2012-12-03
| * | | Bluetooth: Fix missing L2CAP EWS Conf parameterAndrei Emeltchenko2012-12-03
| * | | Bluetooth: AMP: Check that AMP is present and activeAndrei Emeltchenko2012-12-03
| * | | Bluetooth: AMP: Mark controller radio powered down after HCIDEVDOWNAndrei Emeltchenko2012-12-03
| * | | Bluetooth: Refactor l2cap_send_disconn_reqAndrei Emeltchenko2012-12-03
| * | | Bluetooth: Move double negation to macrosGustavo Padovan2012-12-03
| * | | Bluetooth: Implement deferred sco socket setupFrédéric Dalleau2012-12-03
| * | | Bluetooth: Add BT_DEFER_SETUP option to sco socketFrédéric Dalleau2012-12-03
| * | | Bluetooth: cancel power_on work when unregistering the deviceGustavo Padovan2012-12-03
| * | | Bluetooth: Add missing lock nesting notationGustavo Padovan2012-12-03
* | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-26
|\ \ \ \ | | |_|/ | |/| |
| * | | cfg80211: fix some tracing output issuesJohannes Berg2012-11-26
| * | | mac80211: support VHT rates in TX infoJohannes Berg2012-11-26
| * | | mac80211: support drivers reporting VHT RXJohannes Berg2012-11-26
| * | | nl80211/cfg80211: add VHT MCS supportJohannes Berg2012-11-26
| * | | mac80211: convert to channel definition structJohannes Berg2012-11-26
| * | | nl80211/cfg80211: support VHT channel configurationJohannes Berg2012-11-26