summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-12-054-26/+71
|\
| * Bluetooth: Enabled LE Direct Advertising Report event if supportedMarcel Holtmann2014-12-051-0/+1
| * Bluetooth: Add definitions for LE Direct Advertising Report eventMarcel Holtmann2014-12-051-0/+10
| * Bluetooth: Move LE advertising report defines to the right locationMarcel Holtmann2014-12-051-19/+19
| * Bluetooth: Report invalid RSSI for service discovery and background scanMarcel Holtmann2014-12-051-0/+3
| * Bluetooth: Add helper function for clearing the discovery filterMarcel Holtmann2014-12-051-0/+8
| * Bluetooth: Add extra discovery fields for storing filter informationJakub Pawlowski2014-12-051-0/+4
| * Bluetooth: Add definitions for MGMT_OP_START_SERVICE_DISCOVERYJakub Pawlowski2014-12-051-0/+9
| * Bluetooth: Add HCI_RSSI_INVALID for unknown RSSI valueMarcel Holtmann2014-12-051-0/+1
| * Bluetooth: Store address type with OOB dataJohan Hedberg2014-12-031-3/+5
| * Bluetooth: Unify remote OOB data functionsJohan Hedberg2014-12-031-4/+2
| * Bluetooth: Add skeleton for BR/EDR SMP channelJohan Hedberg2014-12-032-0/+3
| * Bluetooth: Add debugfs switch for forcing SMP over BR/EDRJohan Hedberg2014-12-031-0/+1
| * Bluetooth: Add hci_conn flag for new link key generationJohan Hedberg2014-12-031-0/+1
| * Bluetooth: Rename hci_find_ltk_by_addr to hci_find_ltkJohan Hedberg2014-12-031-2/+2
| * Bluetooth: Remove unused hci_find_ltk functionJohan Hedberg2014-12-031-2/+0
| * Bluetooth: Use custom macro for testing BR/EDR SC enabledJohan Hedberg2014-12-031-0/+3
| * Bluetooth: Add mgmt support for LE Secure Connections LTK typesJohan Hedberg2014-12-031-0/+3
| * Bluetooth: Track both local and remote L2CAP fixed channel maskJohan Hedberg2014-12-021-2/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-nextJohn W. Linville2014-12-044-30/+84
|\ \
| * | mac80211: add ieee80211_tx_status_noskbFelix Fietkau2014-11-281-0/+20
| * | mac80211: add tx_status_noskb to rate_control_opsFelix Fietkau2014-11-281-0/+4
| * | cfg80211: leave invalid channels on regdomain changeArik Nemtsov2014-11-281-0/+12
| * | cfg80211: clean up beacon loss CQM eventJohannes Berg2014-11-263-3/+21
| * | cfg80211: refactor the various CQM event sending codeJohannes Berg2014-11-261-27/+27
* | | Merge tag 'nfc-next-3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-12-048-16/+74
|\ \ \
| * | | NFC: NCI: Fix max length of General Bytes in ATR_RESJulien Lefrique2014-12-021-0/+2
| * | | NFC: hci: Add specific hci macro to not create a pipeChristophe Ricard2014-12-021-0/+1
| * | | NFC: netlink: Add new netlink command NFC_CMD_ACTIVATE_TARGETChristophe Ricard2014-12-021-0/+1
| * | | NFC: nci: Add se_io NCI operandChristophe Ricard2014-12-021-0/+3
| * | | NFC: nci: Update nci_disable_se to run proprietary commands to disable a secu...Christophe Ricard2014-12-021-0/+1
| * | | NFC: nci: Update nci_enable_se to run proprietary commands to enable a secure...Christophe Ricard2014-12-021-0/+1
| * | | NFC: nci: Update nci_discover_se to run proprietary commands to discover all ...Christophe Ricard2014-12-021-0/+1
| * | | NFC: hci: Add se_io HCI operandChristophe Ricard2014-12-021-0/+3
| * | | NFC: st21nfcb: Remove gpio_irq field in static and dts configurationChristophe Ricard2014-12-021-1/+0
| * | | NFC: st21nfca: Remove gpio_irq field in static and dts configurationChristophe Ricard2014-12-021-1/+0
| * | | NFC: NCI: Configure ATR_RES general bytesJulien Lefrique2014-11-281-0/+1
| * | | NFC: NCI: Handle Target mode activationJulien Lefrique2014-11-284-14/+37
| * | | NFC: NCI: Enable NFC-DEP in Listen A and Listen FJulien Lefrique2014-11-281-0/+10
| * | | NFC: digital: Add NFC-DEP Initiator-side ATN SupportMark A. Greer2014-11-281-0/+1
| * | | NFC: digital: Add NFC-DEP Target-side NACK SupportMark A. Greer2014-11-281-0/+3
| * | | NFC: digital: Add NFC-DEP Initiator-side NACK SupportMark A. Greer2014-11-281-0/+2
| * | | NFC: digital: Add NFC-DEP Send Chaining SupportMark A. Greer2014-11-281-0/+3
| * | | NFC: digital: Implement NFC-DEP max payload lengthsMark A. Greer2014-11-281-0/+3
| * | | NFC: digital: Add Target-mode NFC-DEP DID SupportMark A. Greer2014-11-281-0/+1
* | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-12-011-0/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bluetooth: Convert link keys list to use RCUJohan Hedberg2014-11-191-0/+1
* | | Merge tag 'mac80211-next-for-john-2014-11-20' of git://git.kernel.org/pub/scm...John W. Linville2014-11-204-9/+391
|\ \ \ | | |/ | |/|
| * | mac80211: notify drivers on sta rate table changesJohannes Berg2014-11-191-0/+6
| * | nl80211: Replace interface socket owner attribute with more generic oneJukka Rissanen2014-11-191-3/+4