summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-01-3017-159/+457
|\
| * mac80211: fix mesh_sta_info_get() reshuffle damageThomas Pedersen2013-01-281-0/+2
| * cfg80211/nl80211: add API for MAC address ACLsVasanthakumar Thiagarajan2013-01-254-0/+151
| * mac80211: avoid a build warningArnd Bergmann2013-01-251-4/+4
| * mac80211: remove redundant checkJohannes Berg2013-01-241-11/+10
| * cfg80211: fix channel check in cfg80211_can_use_iftype_chanSimon Wunderlich2013-01-241-1/+2
| * mac80211: support mesh rate updatesThomas Pedersen2013-01-242-2/+9
| * mac80211: clean up mesh sta allocation warningThomas Pedersen2013-01-242-68/+95
| * mac80211: fix aggregation state with current driversJohannes Berg2013-01-242-16/+10
| * mac80211: provide the vif in rssi_callbackEmmanuel Grumbach2013-01-243-7/+11
| * mac80211: allow drivers to access IPv6 informationJohannes Berg2013-01-184-0/+69
| * mac80211: improve aggregation debug messagesJohannes Berg2013-01-182-22/+36
| * mac80211: remove ARP filter enable/disable logicJohannes Berg2013-01-185-27/+15
| * mac80211: add op to configure default key idYoni Divinsky2013-01-183-1/+43
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-01-308-118/+327
|\ \
| * | Bluetooth: Add support for reading LE supported statesJohan Hedberg2013-01-231-0/+20
| * | Bluetooth: Add support for reading LE White List SizeJohan Hedberg2013-01-231-0/+20
| * | Bluetooth: Add LE Local Features reading supportJohan Hedberg2013-01-231-0/+20
| * | Bluetooth: Fix returning proper cmd_complete for mgmt_block/unblockJohan Hedberg2013-01-231-4/+6
| * | Bluetooth: Fix returning proper cmd_complete for mgmt_disconnectJohan Hedberg2013-01-231-8/+14
| * | Bluetooth: Fix checking for valid disconnect parameters in unpair_deviceJohan Hedberg2013-01-231-0/+5
| * | Bluetooth: Fix checking for valid address type values in mgmt commandsJohan Hedberg2013-01-231-2/+34
| * | Bluetooth: Check for valid key->authenticated value for LTKsJohan Hedberg2013-01-231-0/+2
| * | Bluetooth: Refactor valid LTK data testing into its own functionJohan Hedberg2013-01-231-1/+8
| * | Bluetooth: Fix checking for proper key->master value in Load LTKsJohan Hedberg2013-01-231-0/+9
| * | Bluetooth: Fix returning proper mgmt status for Load LTKsJohan Hedberg2013-01-231-1/+1
| * | Bluetooth: Fix checking for correct mgmt_load_link_keys parametersJohan Hedberg2013-01-231-0/+4
| * | Bluetooth: Fix pair device command reply if adapter is powered offSzymon Janc2013-01-231-6/+6
| * | Bluetooth: Fix Class of Device indication when powering offJohan Hedberg2013-01-231-0/+6
| * | Bluetooth: Fix using system-global workqueue when not necessaryJohan Hedberg2013-01-182-3/+4
| * | Bluetooth: Use req_workqueue for hci_request operationsJohan Hedberg2013-01-182-4/+5
| * | Bluetooth: Add a new workqueue for hci_request operationsJohan Hedberg2013-01-181-0/+11
| * | Bluetooth: Fix uuid output in debugfsGustavo Padovan2013-01-101-11/+11
| * | Bluetooth: Fix sending incorrect new_settings for mgmt_set_poweredJohan Hedberg2013-01-101-2/+3
| * | Bluetooth: Fix returning proper command status for start_discoveryJohan Hedberg2013-01-101-16/+30
| * | Bluetooth: Fix checking for exact values of boolean mgmt parametersJohan Hedberg2013-01-101-0/+36
| * | Bluetooth: Move non-critical sections outside of the dev lockJohan Hedberg2013-01-101-28/+18
| * | Bluetooth: Fix accepting set_dev_class for non-BR/EDR controllersJohan Hedberg2013-01-101-0/+6
| * | Bluetooth: Fix checking for valid device class valuesJohan Hedberg2013-01-101-0/+6
| * | Bluetooth: Fix missing command complete for mgmt_load_long_term_keysJohan Hedberg2013-01-101-2/+5
| * | Bluetooth: Fix missing command complete event for mgmt_confirm_nameJohan Hedberg2013-01-101-1/+2
| * | Bluetooth: mgmt: Avoid using magic number in status codeSzymon Janc2013-01-091-4/+4
| * | Bluetooth: mgmt: Remove not needed restriction on add/remove OOB dataSzymon Janc2013-01-091-17/+0
| * | Bluetooth: AMP: Use set_bit / test_bit for amp_mgr stateAndrei Emeltchenko2013-01-092-5/+5
| * | Bluetooth: AMP: Remove dead codeAndrei Emeltchenko2013-01-091-5/+0
| * | Bluetooth: AMP: Clean up logical link create / acceptAndrei Emeltchenko2013-01-091-12/+5
| * | Bluetooth: AMP: Send A2MP Create Phylink Rsp after Assoc writeAndrei Emeltchenko2013-01-092-3/+39
| * | Bluetooth: Remove unnecessary include l2cap.hRami Rosen2013-01-091-1/+0
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-01-2811-42/+49
|\ \ \
| * \ \ Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-01-226-31/+35
| |\ \ \
OpenPOWER on IntegriCloud