summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-05-1310-17/+38
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211John W. Linville2014-05-122-5/+8
| |\
| | * mac80211: fix vif name tracingEliad Peller2014-05-091-2/+2
| | * mac80211: allow VHT with peers not capable of 40MHzJohannes Berg2014-05-091-3/+6
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211John W. Linville2014-05-066-9/+18
| |\|
| | * mac80211: fix nested rtnl locking on ieee80211_reconfigEliad Peller2014-05-051-1/+1
| | * cfg80211: add cfg80211_sched_scan_stopped_rtnlEliad Peller2014-05-051-2/+10
| | * cfg80211: free sme on connection failuresEliad Peller2014-05-051-1/+1
| | * mac80211: Fix mac80211 station info rx bitrate for IBSS modeHenning Rogge2014-05-051-1/+2
| | * mac80211: fixup radiotap tx flags for RTS/CTSBob Copeland2014-04-221-3/+2Star
| | * mac80211: avoid handling of SMPS for meshChun-Yeow Yeoh2014-04-221-1/+2
| * | Bluetooth: Fix redundant encryption request for reauthenticationJohan Hedberg2014-04-251-3/+6
| * | Bluetooth: Fix triggering BR/EDR L2CAP Connect too earlyJohan Hedberg2014-04-251-0/+6
* | | Merge branch 'rfkill-gpio-cleanups' of git://git.kernel.org/pub/scm/linux/ker...John W. Linville2014-05-061-31/+9Star
|\ \ \
| * | | net: rfkill: gpio: hard-code the gpio namesHeikki Krogerus2014-04-111-17/+2Star
| * | | net: rfkill: gpio: add ACPI IDs for a Broadcom bluetooth chipHeikki Krogerus2014-04-111-0/+5
| * | | net: rfkill: gpio: add ACPI ID for GPS module on Lenovo Miix2Heikki Krogerus2014-04-111-0/+1
| * | | net: rfkill: gpio: remove unused and obsolete platform parametersHeikki Krogerus2014-04-111-14/+1Star
* | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-04-3040-841/+1861
|\ \ \ \
| * | | | mac80211: Support dynamic AP mode channel width changesJouni Malinen2014-04-281-0/+16
| * | | | cfg80211: Dynamic channel bandwidth changes in AP modeJouni Malinen2014-04-283-12/+59
| * | | | mac80211: remove unnecessary assignmentZhao, Gang2014-04-281-4/+1Star
| * | | | mac80211: avoid calling useless channel context codeZhao, Gang2014-04-281-9/+9
| * | | | cfg80211: Use 5MHz bandwidth by default when checking usable channelsRostislav Lisovy2014-04-251-7/+15
| * | | | cfg80211: Add attributes describing prohibited channel bandwidthRostislav Lisovy2014-04-252-0/+15
| * | | | mac80211: change return value of notifier functionZhao, Gang2014-04-253-9/+8Star
| * | | | cfg80211: change return value of notifier functionZhao, Gang2014-04-252-2/+4
| * | | | cfg80211: change wiphy_to_dev function nameZhao, Gang2014-04-2512-117/+118
| * | | | cfg80211: change registered device pointer nameZhao, Gang2014-04-253-196/+196
| * | | | mac80211: remove unnecessary BUG_ON()Zhao, Gang2014-04-251-2/+1Star
| * | | | mac80211: return bool instead of numbers in yes/no functionZhao, Gang2014-04-251-9/+10
| * | | | mac80211: add option to generate CCMP IVs only for mgmt framesMarek Kwaczynski2014-04-251-1/+4
| * | | | mac80211: compute chanctx refcount on-the-flyMichal Kazior2014-04-254-17/+49
| * | | | mac80211: fix racy usage of chanctx->refcountMichal Kazior2014-04-251-8/+9
| * | | | mac80211: split ieee80211_free_chanctx()Michal Kazior2014-04-251-12/+16
| * | | | mac80211: split ieee80211_new_chanctx()Michal Kazior2014-04-251-13/+43
| * | | | mac80211: improve chanctx reservation lookupMichal Kazior2014-04-251-2/+88
| * | | | mac80211: improve find_chanctx() for reservationsMichal Kazior2014-04-251-27/+29
| * | | | mac80211: track reserved vifs in chanctxMichal Kazior2014-04-253-4/+13
| * | | | mac80211: track assigned vifs in chanctxMichal Kazior2014-04-253-0/+9
| * | | | mac80211: add support for radar detection for reservationsMichal Kazior2014-04-252-2/+7
| * | | | mac80211: prevent chanctx overcommitMichal Kazior2014-04-251-1/+23
| * | | | mac80211: add max channel calculation utility functionMichal Kazior2014-04-252-0/+43
| * | | | cfg80211: allow drivers to iterate over matching combinationsMichal Kazior2014-04-251-7/+37
| * | | | cfg80211: Fix GO Concurrent relaxation on UNII-3Ilan Peer2014-04-251-1/+17
| * | | | mac80211: mesh: always use the latest target_snBob Copeland2014-04-221-1/+2
| * | | | mac80211: fix mesh_add_rsn_ie IE finding loopBob Copeland2014-04-221-13/+8Star
| * | | | mac80211: mesh: use u16 return type for u16 getterBob Copeland2014-04-221-1/+1
| * | | | mac80211: Allow HT capa override to add 40 MHz intolerantJouni Malinen2014-04-222-2/+19
| * | | | cfg80211: fix processing world regdomain when non modularLuis R. Rodriguez2014-04-221-1/+1