aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-11-054-5/+74
|\
| * mac80211: process the CSA frame for mesh accordinglyChun-Yeow Yeoh2013-10-281-0/+20
| * mac80211: add ieee80211_tx_prepare_skb() helper functionFelix Fietkau2013-10-281-0/+14
| * cfg80211: export reg_initiator_name()Luis R. Rodriguez2013-10-281-0/+9
| * mac80211: add missing IEEE80211_HW_SUPPORTS_HT_CCK_RATES docsJohannes Berg2013-10-281-0/+4
| * nl80211/cfg80211: enable DFS for IBSS modeSimon Wunderlich2013-10-282-0/+15
| * cfg80211: pass station supported channel and oper class infoSunil Dutt2013-10-112-0/+17
| * cfg80211: rename regulatory_hint_11d() to regulatory_hint_country_ie()Luis R. Rodriguez2013-10-091-1/+1
| * cfg80211: fix nl80211.h documentation for DFS enum statesLuis R. Rodriguez2013-10-081-4/+3
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-11-041-0/+1
|\ \
| * | bcma: make bcma_core_pci_{up,down}() callable from atomic contextArend van Spriel2013-09-261-0/+1
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2013-09-261-0/+1
| |\ \
* | | | cfg80211: export reg_initiator_name()Luis R. Rodriguez2013-10-181-0/+9
* | | | Merge tag 'nfc-next-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-10-186-45/+267
|\ \ \ \
| * | | | NFC: NCI: Modify NCI SPI to implement CS/INT handshake per the specEric Lapuyade2013-09-251-10/+3
| * | | | NFC: NCI: nci_spi_recv_frame() now returns (not forward) the read frameEric Lapuyade2013-09-251-1/+1
| * | | | NFC: Define secure element IO API and commandsSamuel Ortiz2013-09-252-0/+9
| * | | | NFC: Document NFC targets sens_res fieldSamuel Ortiz2013-09-251-0/+8
| * | | | NFC Digital: Add NFC-A technology supportThierry Escande2013-09-251-0/+3
| * | | | NFC Digital: Implement driver commands mechanismThierry Escande2013-09-251-0/+25
| * | | | NFC: Digital Protocol stack implementationThierry Escande2013-09-251-0/+199
| * | | | NFC: NCI: Simplify NCI SPI to become a simple framing/checking layerEric Lapuyade2013-09-252-30/+15
| * | | | NFC: Move struct nfc_phy_ops out of HCI up to nfc core levelEric Lapuyade2013-09-252-6/+6
| * | | | NFC: NCI: Rename spi ndev -> nsdev and nci_dev -> ndev for consistencyEric Lapuyade2013-09-251-13/+13
| * | | | NFC: Convert nfc_dev_info and nfc_dev_err to nfc_<level>Joe Perches2013-09-251-2/+2
| * | | | NFC: Replace nfc_dev_dbg with dev_dbgJoe Perches2013-09-251-1/+0
| * | | | NFC: Export nfc_find_se()Arron Wang2013-09-251-0/+1
| |/ / /
* | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-10-1810-422/+89
|\ \ \ \
| * | | | Bluetooth: Read current IAC LAP on controller setupMarcel Holtmann2013-10-141-0/+2
| * | | | Bluetooth: Read number of supported IAC on controller setupMarcel Holtmann2013-10-142-0/+7
| * | | | Bluetooth: Introduce L2CAP channel callback for resumingMarcel Holtmann2013-10-141-0/+1
| * | | | Bluetooth: Introduce L2CAP channel flag for defer setupMarcel Holtmann2013-10-141-0/+1
| * | | | Bluetooth: Provide msg_name callback for L2CAP connectionless channelsMarcel Holtmann2013-10-131-0/+2
| * | | | Bluetooth: Add support for per socket msg_name callbackMarcel Holtmann2013-10-131-0/+1
| * | | | Bluetooth: Remove src and dst fields from bt_sock structureMarcel Holtmann2013-10-131-2/+0
| * | | | Bluetooth: Store RFCOMM address information in its own socket structureMarcel Holtmann2013-10-131-0/+2
| * | | | Bluetooth: Store SCO address information in its own socket structureMarcel Holtmann2013-10-131-0/+2
| * | | | Bluetooth: Use SCO addresses from HCI connection directlyMarcel Holtmann2013-10-131-3/+0
| * | | | Bluetooth: Return the correct address type for L2CAP socketsMarcel Holtmann2013-10-131-2/+3
| * | | | Bluetooth: Store address information in L2CAP channel structureMarcel Holtmann2013-10-131-0/+2
| * | | | Bluetooth: Store source address of HCI connectionsMarcel Holtmann2013-10-131-0/+1
| * | | | Bluetooth: Store the source address type of LE connectionsMarcel Holtmann2013-10-131-0/+1
| * | | | Bluetooth: Remove pointless bdaddr_to_le() helper functionMarcel Holtmann2013-10-131-2/+0
| * | | | Bluetooth: Remove l2cap_conn->src and l2cap_conn->dst pointersMarcel Holtmann2013-10-131-3/+0
| * | | | Bluetooth: The L2CAP fixed channel connectionless data is supportedMarcel Holtmann2013-10-121-0/+1
| * | | | Bluetooth: Allow 3D profile to use security mode 4 level 0Marcel Holtmann2013-10-121-0/+1
| * | | | Bluetooth: Add management command for setting LE scan parametersMarcel Holtmann2013-10-111-0/+7
| * | | | Bluetooth: Make LE scan interval and window a controller optionMarcel Holtmann2013-10-111-0/+2
| * | | | Bluetooth: Add hdev parameter to hdev->send driver callbackMarcel Holtmann2013-10-111-1/+1
| * | | | Bluetooth: Provide hdev parameter to hci_recv_frame() driver callbackMarcel Holtmann2013-10-111-1/+1