summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-279-84/+115
|\
| * Bluetooth: Fix returning peer address in pending connect stateJohan Hedberg2014-03-262-2/+4
| * Bluetooth: Remove unnecessary assignment in SMPJohan Hedberg2014-03-241-2/+0
| * Bluetooth: Fix potential NULL pointer dereference in smp_conn_securityJohan Hedberg2014-03-241-1/+1
| * Bluetooth: Remove LTK re-encryption procedureJohan Hedberg2014-03-242-49/+7
| * Bluetooth: Don't try to confirm locally initiated SMP pairingJohan Hedberg2014-03-241-0/+5
| * Bluetooth: Add SMP flag to track which side is the initiatorJohan Hedberg2014-03-242-0/+7
| * Bluetooth: Fix SMP confirmation callback handlingJohan Hedberg2014-03-241-0/+4
| * Bluetooth: Add missing cmd_status handler for LE_Start_EncryptionJohan Hedberg2014-03-241-0/+34
| * Bluetooth: Fix potential NULL pointer dereference in SMPJohan Hedberg2014-03-241-1/+7
| * Bluetooth: bluecard: Use del_timer_sync() in teardown pathThomas Gleixner2014-03-231-1/+1
| * Bluetooth: Track current configured LE scan type parameterMarcel Holtmann2014-03-212-0/+26
| * Bluetooth: btmrvl: don't consume all vendor specific eventsAmitkumar Karwar2014-03-201-5/+6
| * Bluetooth: Fix address value for early disconnection eventsJohan Hedberg2014-03-202-21/+11
| * Bluetooth: Fix passkey endianess in user_confirm and notify_passkeyJohan Hedberg2014-03-194-6/+6
* | brcmfmac: fallback to mimo_bw_cap for older firmwaresArend van Spriel2014-03-201-8/+18
* | brcmfmac: only show error message when brcmf_sdiod_regrw_helper() failsArend van Spriel2014-03-201-20/+21
* | brcmfmac: reinit watchdog completion after handling watchdogArend van Spriel2014-03-201-0/+1
* | brcmfmac: Enable 40MHz bandwidth in 2GHz band and OBSS scanning operationsDaniel Kim2014-03-202-0/+36
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-2027-224/+451
|\ \ | |/
| * Bluetooth: Enforce strict Secure Connections Only mode securityMarcel Holtmann2014-03-192-0/+23
| * Bluetooth: Fix Pair Device response parameters for pairing failureJohan Hedberg2014-03-191-2/+14
| * Bluetooth: Fix SMP user passkey notification mgmt eventJohan Hedberg2014-03-191-2/+3
| * Bluetooth: Increase SMP re-encryption delay to 500msJohan Hedberg2014-03-191-1/+1
| * Bluetooth: Simplify logic when checking SMP_FLAG_TK_VALIDJohan Hedberg2014-03-191-4/+2
| * Bluetooth: Fix MITM flag when initiating SMP pairingJohan Hedberg2014-03-181-0/+6
| * Bluetooth: Fix smp_e byte order to be consistent with SMP specificationJohan Hedberg2014-03-181-55/+46
| * Bluetooth: Fix const declaration for swap function src parameterJohan Hedberg2014-03-181-2/+2
| * Bluetooth: Fix updating SMP remote key distribution informationJohan Hedberg2014-03-141-0/+5
| * Bluetooth: make sure 6LOWPAN_IPHC is built-in if neededArnd Bergmann2014-03-131-1/+1
| * Bluetooth: Convert uses of __constant_<foo> to <foo>Joe Perches2014-03-1211-96/+96
| * Bluetooth: Enable duplicates filter in background scanAndre Guedes2014-03-111-5/+7
| * Bluetooth: Fix aborting eSCO connection in case of error 0x20Andrew Earl2014-03-111-0/+1
| * Bluetooth: make bluetooth 6lowpan as an optionAlexander Aring2014-03-113-2/+30
| * Bluetooth: Make LTK and CSRK only persisent when bondingMarcel Holtmann2014-03-103-10/+20
| * Bluetooth: Add support for handling signature resolving keysMarcel Holtmann2014-03-095-5/+114
| * Bluetooth: Fix skb allocation check for A2MPGustavo Padovan2014-03-071-1/+7
| * Bluetooth: Fix endianess issue in the ath3k driverPeng Chen2014-03-071-2/+2
| * Bluetooth: Fix expected key count debug logsJohan Hedberg2014-03-071-3/+3
| * Bluetooth: Add a new PID/VID 0cf3/e005 for AR3012.Peng Chen2014-03-052-0/+3
| * Bluetooth: Remove assignments in if-statementsValentin Ilie2014-03-059-35/+59
| * Bluetooth: Fix removing Long Term KeyClaudio Takahasi2014-03-051-1/+7
| * Bluetooth: Stop BCSP/H5 timer before cleaning upMichael Knudsen2014-03-042-3/+5
* | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-03-2027-195/+339
|\ \
| * | cfg80211: remove macro ASSERT_RDEV_LOCK(rdev)Zhao, Gang2014-03-194-5/+2
| * | cfg80211: remove unnecessary checkZhao, Gang2014-03-191-3/+0
| * | mac80211: set beamforming bit in radiotapEmmanuel Grumbach2014-03-192-0/+4
| * | cfg80211/mac80211: ignore signal if the frame was heard on wrong channelEmmanuel Grumbach2014-03-194-37/+31
| * | cfg80211: make __cfg80211_join_ibss() staticZhao, Gang2014-03-192-8/+4
| * | mac80211: add status_driver_data array to ieee80211_tx_infoEliad Peller2014-03-191-2/+2
View Lorry Controller Status