summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-nextJohn W. Linville2014-05-2260-727/+1484
|\
| * cfg80211: allow RSSI compensationEmmanuel Grumbach2014-05-222-4/+15
| * cfg80211: don't set reg timeout for user-handled hintArik Nemtsov2014-05-211-1/+2
| * cfg80211: implement cfg80211_get_station cfg80211 APIAntonio Quartulli2014-05-213-1/+32
| * mac80211: export the expected throughputAntonio Quartulli2014-05-216-0/+94
| * cfg80211: export expected throughput through get_station()Antonio Quartulli2014-05-203-28/+41
| * cfg80211: constify wowlan/coalesce mask/pattern pointersJohannes Berg2014-05-194-21/+26
| * cfg80211: constify more pointers in the cfg80211 APIJohannes Berg2014-05-1912-27/+29
| * cfg80211: constify MAC addresses in cfg80211 opsJohannes Berg2014-05-1919-102/+106
| * mac80211: fix csa_counter_offs argument name in docbookLuciano Coelho2014-05-191-2/+3
| * cfg80211: add documentation for max_num_csa_countersLuciano Coelho2014-05-191-5/+5
| * mac80211: minstrel-ht: small clarificationsJohannes Berg2014-05-191-2/+3
| * mac80211: Handle the CSA counters correctlyAndrei Otcheretianski2014-05-154-25/+80
| * mac80211: Provide ieee80211_beacon_get_template APIAndrei Otcheretianski2014-05-152-29/+94
| * mac80211: Support multiple CSA countersAndrei Otcheretianski2014-05-156-33/+61
| * cfg80211: Support multiple CSA countersAndrei Otcheretianski2014-05-156-32/+96
| * mac80211: Update CSA counters in mgmt framesAndrei Otcheretianski2014-05-153-3/+20
| * cfg80211: Add API to update CSA counters in mgmt framesAndrei Otcheretianski2014-05-153-2/+34
| * cfg80211: pass the actual iftype when calling cfg80211_chandef_dfs_required()Luciano Coelho2014-05-152-4/+3
| * cfg80211: fix start_radar_detection issueJanusz Dziedzic2014-05-141-1/+1
| * cfg80211: allow restricting supported dfs regionsFelix Fietkau2014-05-134-2/+23
| * mac80211: handle failed restart/resume betterJohannes Berg2014-05-096-51/+153
| * mac80211: fix sparse warning caused by __ieee80211_channel_switch()Luciano Coelho2014-05-081-2/+3
| * cfg80211: fix docbook warningLuciano Coelho2014-05-081-1/+1
| * mac80211: disconnect iface if CSA unexpectedly failsMichal Kazior2014-05-081-4/+15
| * rfkill-gpio: Use gpio cansleep versionLoic Poulain2014-05-071-11/+8
| * mac80211: ignore cqm during csaMichal Kazior2014-05-071-0/+9
| * cfg80211: export interface stopping functionMichal Kazior2014-05-067-11/+80
| * mac80211: split CSA finalize functionMichal Kazior2014-05-061-24/+37
| * mac80211: fix CSA tx queue stoppingMichal Kazior2014-05-065-23/+104
| * mac80211: mark local variable __maybe_unusedJohannes Berg2014-05-051-2/+2
| * mac80211: move TDLS code to another fileArik Nemtsov2014-05-054-315/+336
| * mac80211: set an external flag for TDLS stationsArik Nemtsov2014-05-052-0/+4
| * mac80211: remove BUG_ON usageJohannes Berg2014-04-293-6/+9
| * cfg80211: remove BUG_ON usageJohannes Berg2014-04-292-3/+5
* | Merge tag 'nfc-next-3.16-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-05-2228-139/+2368
|\ \
| * | NFC: st21nfca: Add ISO15693 Reader/Writer supportChristophe Ricard2014-05-201-1/+72
| * | NFC: st21nfca: Improve load_sessionChristophe Ricard2014-05-201-2/+19
| * | NFC: dts: st21nfca_i2c: Add DTS DocumentationChristophe Ricard2014-05-201-0/+33
| * | NFC: dts: st21nfca: Add device-tree (Open Firmware) support to st21nfcaChristophe Ricard2014-05-201-19/+87
| * | NFC: NCI: Send all NCI frames to raw socketsHiren Tandel2014-05-201-0/+9
| * | NFC: Add RAW socket type support for SOCKPROTO_RAWHiren Tandel2014-05-206-15/+117
| * | NFC: NCI: No need to reverse ATR_RES ResponseHiren Tandel2014-05-191-5/+2
| * | NFC: digital: Handle multiple SENSF_REQ framesMark A. Greer2014-05-191-1/+13
| * | NFC: digital: SENSF_RES excludes RD when SENSF_REQ RC is zeroMark A. Greer2014-05-191-1/+1
| * | NFC: st21nfca: Free buffer when a bad frame is detectedChristophe Ricard2014-05-051-0/+1
| * | NFC: st21nfca: Synchronize i2c Tx and Rx pathChristophe Ricard2014-05-051-0/+6
| * | NFC: st21nfca: Improved i2c Rx data correctness checkChristophe Ricard2014-05-051-3/+26
| * | NFC: st21nfca: Fix st21nfca_hci_remove_len_crc tail room handlingChristophe Ricard2014-05-051-12/+9
| * | NFC: st21nfca: Fix incorrect byte stuffing revocationChristophe Ricard2014-05-051-4/+3