summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfc-next-3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-10-1810-154/+2627
|\
| * NFC: Fix SE API related sparse warningSamuel Ortiz2013-10-071-1/+1
| * NFC: NCI: Modify NCI SPI to implement CS/INT handshake per the specEric Lapuyade2013-09-251-22/+31
| * NFC: NCI: nci_spi_recv_frame() now returns (not forward) the read frameEric Lapuyade2013-09-251-16/+10
| * NFC: NCI: zero struct spi_transfer variables before usageEric Lapuyade2013-09-251-0/+9
| * NFC: netlink: SE API implementationSamuel Ortiz2013-09-251-0/+91
| * NFC: digital: Fix sens_res endiannes handlingThierry Escande2013-09-251-9/+6
| * NFC: rawsock: Fix a memory leakThierry Escande2013-09-251-2/+5
| * NFC: digital: digital_tg_send_sensf_res() can be staticFengguang Wu2013-09-251-1/+1
| * NFC: digital: Add newline to pr_* callsSamuel Ortiz2013-09-253-26/+22
| * NFC: digital: Remove PR_ERR and PR_DBG macrosSamuel Ortiz2013-09-254-27/+31
| * NFC: NCI: Store the spi device pointer from the spi instanceEric Lapuyade2013-09-251-0/+1
| * NFC Digital: Add target NFC-DEP supportThierry Escande2013-09-254-7/+755
| * NFC Digital: Add initiator NFC-DEP supportThierry Escande2013-09-255-6/+435
| * NFC Digital: Add NFC-F technology supportThierry Escande2013-09-254-0/+153
| * NFC Digital: Add NFC-A technology supportThierry Escande2013-09-254-4/+488
| * NFC Digital: Implement driver commands mechanismThierry Escande2013-09-254-8/+427
| * NFC: Digital Protocol stack implementationThierry Escande2013-09-254-0/+192
| * NFC: Set active target upon DEP up event receptionSamuel Ortiz2013-09-251-0/+13
| * NFC: NCI: Simplify NCI SPI to become a simple framing/checking layerEric Lapuyade2013-09-251-125/+55
| * NFC: NCI: Rename spi ndev -> nsdev and nci_dev -> ndev for consistencyEric Lapuyade2013-09-251-64/+64
| * NFC: NCI: Fix wrong allocation size in nci_spi_allocate_device()Eric Lapuyade2013-09-251-1/+1
| * NFC: Export nfc_find_se()Arron Wang2013-09-251-4/+5
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-10-1820-569/+1373
|\ \
| * | Bluetooth: Read current IAC LAP on controller setupMarcel Holtmann2013-10-141-0/+3
| * | Bluetooth: Read number of supported IAC on controller setupMarcel Holtmann2013-10-142-1/+24
| * | Bluetooth: Check that scan window is smaller or equal than scan intervalMarcel Holtmann2013-10-141-0/+4
| * | Bluetooth: Check that bind() bdaddr type matches connect()Johan Hedberg2013-10-141-0/+6
| * | Bluetooth: Reject invalid bdaddr types for socketsJohan Hedberg2013-10-141-0/+6
| * | Bluetooth: Convert Set Discoverable to use an asynchronous requestJohan Hedberg2013-10-141-9/+54
| * | Bluetooth: Fix updating scan mode in set_bredr()Johan Hedberg2013-10-141-1/+5
| * | Bluetooth: Move set_bredr_scan() to avoid forward declarationJohan Hedberg2013-10-141-20/+20
| * | Bluetooth: Make Set Connectable also update the LE advertising typeJohan Hedberg2013-10-141-5/+30
| * | Bluetooth: Fix updating advertising data needlesslyJohan Hedberg2013-10-141-1/+1
| * | Bluetooth: Move static advertising functions to avoid forward declarationsJohan Hedberg2013-10-141-28/+28
| * | Bluetooth: Add missing error handling for Set ConnectableJohan Hedberg2013-10-141-0/+7
| * | Bluetooth: Move more logic into set_connectable complete callbackJohan Hedberg2013-10-141-4/+19
| * | Bluetooth: Reorganize set_connectable HCI command sendingJohan Hedberg2013-10-141-16/+20
| * | Bluetooth: Introduce L2CAP channel callback for resumingMarcel Holtmann2013-10-142-5/+10
| * | Bluetooth: Introduce L2CAP channel flag for defer setupMarcel Holtmann2013-10-142-10/+12
| * | Bluetooth: Adjust header for proc socket informationMarcel Holtmann2013-10-141-1/+1
| * | Bluetooth: Increase minor version of core moduleMarcel Holtmann2013-10-131-1/+1
| * | Bluetooth: Provide msg_name callback for L2CAP connectionless channelsMarcel Holtmann2013-10-132-1/+18
| * | Bluetooth: Add support for per socket msg_name callbackMarcel Holtmann2013-10-131-4/+11
| * | Bluetooth: Use l2cap_pi(sk) directly where possibleMarcel Holtmann2013-10-131-8/+7
| * | Bluetooth: Remove src and dst fields from bt_sock structureMarcel Holtmann2013-10-131-3/+1
| * | Bluetooth: Store RFCOMM address information in its own socket structureMarcel Holtmann2013-10-131-13/+15
| * | Bluetooth: Store SCO address information in its own socket structureMarcel Holtmann2013-10-131-18/+18
| * | Bluetooth: Use SCO addresses from HCI connection directlyMarcel Holtmann2013-10-131-12/+8
| * | Bluetooth: Access BNEP session addresses through L2CAP channelMarcel Holtmann2013-10-131-12/+6
OpenPOWER on IntegriCloud