summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-06-2410-343/+321
|\
| * Bluetooth: Improve comments on the HCI_Delete_Store_Link_Key issueGustavo Padovan2013-06-231-1/+9
| * Bluetooth: Add missing reset_resume dev_pm_opsShuah Khan2013-06-231-0/+1
| * Bluetooth: hidp: using strlcpy instead of strncpy, also beautify code.Chen Gang2013-06-231-10/+4
| * Bluetooth: Remove unneeded flagAndrei Emeltchenko2013-06-232-3/+0
| * Bluetooth: Use HCI_MGMT instead of HCI_LINK_KEYS flagAndrei Emeltchenko2013-06-231-2/+2
| * Bluetooth: Mgmt Device Found EventAndre Guedes2013-06-231-0/+3
| * Bluetooth: Remove empty event handlerAndre Guedes2013-06-231-12/+0
| * Bluetooth: Remove inquiry helpersAndre Guedes2013-06-232-32/+0
| * Bluetooth: Remove LE scan helpersAndre Guedes2013-06-232-126/+0
| * Bluetooth: Refactor hci_cc_le_set_scan_enableAndre Guedes2013-06-231-6/+3
| * Bluetooth: Make mgmt_stop_discovery_failed staticAndre Guedes2013-06-232-17/+16
| * Bluetooth: Remove stop discovery handling from hci_event.cAndre Guedes2013-06-231-14/+2
| * Bluetooth: Update stop_discovery to use HCI requestAndre Guedes2013-06-231-7/+40
| * Bluetooth: Use HCI request in interleaved discoveryAndre Guedes2013-06-234-29/+64
| * Bluetooth: Move discovery macros to hci_core.hAndre Guedes2013-06-232-18/+16
| * Bluetooth: Make mgmt_start_discovery_failed staticAndre Guedes2013-06-232-22/+21
| * Bluetooth: Remove start discovery handling from hci_event.cAndre Guedes2013-06-231-23/+1
| * Bluetooth: Update start_discovery to use HCI requestAndre Guedes2013-06-231-9/+85
| * Bluetooth: Make inquiry_cache_flush non-staticAndre Guedes2013-06-232-5/+6
| * Bluetooth: Fix multiple LE socket handlingJohan Hedberg2013-06-231-4/+8
| * Bluetooth: Remove useless hci_conn disc_timeout settingJohan Hedberg2013-06-231-2/+0
| * Bluetooth: Simplify hci_conn_hold/drop logic for L2CAPJohan Hedberg2013-06-231-3/+5
| * Bluetooth: Remove unnecessary L2CAP channel state checkJohan Hedberg2013-06-231-4/+1
| * Bluetooth: Remove useless sk variable in l2cap_le_conn_readyJohan Hedberg2013-06-231-5/+3
| * Bluetooth: Fix duplicate call to l2cap_chan_ready()Johan Hedberg2013-06-231-2/+0
| * Bluetooth: Add clarifying comment to l2cap_conn_ready()Johan Hedberg2013-06-231-0/+3
| * Bluetooth: Fix hardcoding ATT CID in __l2cap_chan_add()Johan Hedberg2013-06-231-2/+6
| * Bluetooth: Fix EBUSY condition test in l2cap_chan_connectJohan Hedberg2013-06-231-10/+4
| * Bluetooth: Fix LE vs BR/EDR selection when connectingJohan Hedberg2013-06-231-1/+1
| * Bluetooth: Rename L2CAP_CID_LE_DATA to L2CAP_CID_ATTJohan Hedberg2013-06-233-10/+10
| * Bluetooth: Handle LE L2CAP signalling in its own functionJohan Hedberg2013-06-231-5/+48
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-06-2423-231/+415
|\ \
| * | mac80211: initialize power mode for mesh STAsThomas Pedersen2013-06-241-0/+1
| * | mac80211: allow self-protected frame tx without staThomas Pedersen2013-06-241-1/+2
| * | cfg80211: fix compilation warning for cfg80211_leave_all()Arend van Spriel2013-06-241-1/+1
| * | wireless: check for dangling wdev->current_bss pointerBen Greear2013-06-241-0/+6
| * | wireless: add comments about bss refcountingBen Greear2013-06-242-0/+7
| * | wireless: Make sure __cfg80211_connect_result always puts bssBen Greear2013-06-241-1/+4
| * | cfg80211: hold BSS over association processJohannes Berg2013-06-192-5/+14
| * | cfg80211: require passing BSS struct back to cfg80211_assoc_timeoutJohannes Berg2013-06-193-19/+20
| * | nl80211: use small state buffer for wiphy_dumpJohannes Berg2013-06-191-94/+116
| * | Merge remote-tracking branch 'mac80211/master' into HEADJohannes Berg2013-06-197-21/+122
| |\ \
| | * | nl80211: fix attrbuf access race by allocating a separate oneJohannes Berg2013-06-191-2/+9
| * | | Revert "mac80211: in IBSS use the Auth frame to trigger STA reinsertion"Antonio Quartulli2013-06-183-46/+7
| * | | mac80211: change IBSS channel state to chandefSimon Wunderlich2013-06-182-13/+12
| * | | mac80211: fix various components for the new 5 and 10 MHz widthsSimon Wunderlich2013-06-185-3/+31
| * | | nl80211: add rate flags for 5/10 Mhz channelsSimon Wunderlich2013-06-181-0/+28
| * | | nl80211/cfg80211: add 5 and 10 MHz defines and wiphy flagSimon Wunderlich2013-06-184-12/+72
| * | | mac80211: update mesh beacon on workqueueThomas Pedersen2013-06-183-12/+44
OpenPOWER on IntegriCloud