summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* NFC: hci: Add stop_poll HCI operand.Christophe Ricard2014-07-231-2/+5
* NFC: nci: Add T1T support notificationChristophe Ricard2014-07-231-1/+3
* NFC: digital: Add digital framing calls when in target modeMark A. Greer2014-07-211-0/+21
* NFC: digital: Clear poll_tech_count before activating targetMark A. Greer2014-07-212-6/+16
* NFC: digital: Check for NFC-DEP before checking for Type 4 tagMark A. Greer2014-07-211-2/+2
* Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-07-1816-243/+276
|\
| * Bluetooth: cmtp: Remove unnecessary null testHimangi Saraogi2014-07-141-6/+0
| * Bluetooth: Fix trying LTK re-encryption when we don't have an LTKJohan Hedberg2014-07-141-2/+5
| * Bluetooth: Remove sco_chan_get helper functionMarcel Holtmann2014-07-141-11/+9
| * Bluetooth: Convert L2CAP ident spinlock into a mutexMarcel Holtmann2014-07-131-3/+3
| * Bluetooth: Remove unneeded forward declaration of sco_chan_delMarcel Holtmann2014-07-131-29/+27
| * Bluetooth: Remove unneeded forward declaration of __sco_chan_addMarcel Holtmann2014-07-131-12/+11
| * Bluetooth: Allocate struct inquiry_entry with GFP_KERNELMarcel Holtmann2014-07-131-1/+1
| * Bluetooth: Enable LE Long Term Key Request event only when supportedMarcel Holtmann2014-07-131-1/+4
| * Bluetooth: Enable LE encryption events only when supportedMarcel Holtmann2014-07-131-4/+7
| * Bluetooth: Read LE Advertising Channel TX Power only when availableMarcel Holtmann2014-07-131-3/+5
| * 6lowpan: introduce new net/6lowpan directoryAlexander Aring2014-07-128-14/+16
| * Bluetooth: Fix tracking local SSP authentication requirementJohan Hedberg2014-07-111-9/+8
| * Bluetooth: Move SCO timeout constants into net/bluetooth/sco.cMarcel Holtmann2014-07-111-0/+3
| * Bluetooth: Move struct sco_conn into net/bluetooth/sco.cMarcel Holtmann2014-07-111-0/+13
| * Bluetooth: Move struct sco_pinfo into net/bluetooth/sco.cMarcel Holtmann2014-07-111-0/+12
| * Bluetooth: Update the list of L2CAP fixed channelsMarcel Holtmann2014-07-111-1/+1
| * Bluetooth: Move HCI request internals to net/bluetooth/hci_core.cMarcel Holtmann2014-07-112-1/+15
| * Bluetooth: Move struct hci_pinfo into net/bluetooth/hci_sock.cMarcel Holtmann2014-07-111-0/+11
| * Bluetooth: Delcare the hci_sec_filter as constMarcel Holtmann2014-07-111-1/+1
| * Bluetooth: Move struct hci_sec_filter next to its userMarcel Holtmann2014-07-111-0/+8
| * Bluetooth: Set HCI_PAIRABLE during power on for legacy ioctlMarcel Holtmann2014-07-101-6/+10
| * Bluetooth: Mark controller is down when HCI_AUTO_OFF is setMarcel Holtmann2014-07-101-6/+19
| * Bluetooth: Remove unneeded mgmt_write_scan_failed functionJohan Hedberg2014-07-102-14/+0
| * Bluetooth: Remove unneeded mgmt_discoverable functionJohan Hedberg2014-07-103-61/+49
| * Bluetooth: Refactor ioctl scan state update to its own functionJohan Hedberg2014-07-101-13/+22
| * Bluetooth: Remove unneeded mgmt_connectable functionJohan Hedberg2014-07-103-40/+4
| * Bluetooth: Fix using test_and_clear instead of test_and_setJohan Hedberg2014-07-101-2/+2
| * Bluteooth: Reject SMP bonding if HCI_PAIRABLE is not setJohan Hedberg2014-07-101-0/+9
| * Bluetooth: Fix advertising parameter update when toggling connectableJohan Hedberg2014-07-101-2/+2
| * Bluetooth: Fix incorrect clearing of SMP_FLAG_INITIATORJohan Hedberg2014-07-091-4/+0
| * Bluetooth: Fix forcing SMP just-works with no-bondingJohan Hedberg2014-07-091-4/+0
| * Bluetooth: Always confirm incoming SMP just-works requestsJohan Hedberg2014-07-091-5/+11
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-07-1015-1287/+3044
|\ \ | |/
| * Bluetooth: Don't send ERTM configuration option when disabledMarcel Holtmann2014-07-091-0/+3
| * Bluetooth: Fix setting HCI_CONNECTABLE from ioctl codeJohan Hedberg2014-07-092-0/+22
| * Bluetooth: Add white list lookup for incoming connection requestsJohan Hedberg2014-07-091-4/+12
| * Bluetooth: Enable page scan also if there are white list entriesJohan Hedberg2014-07-091-2/+4
| * Bluetooth: Refactor connection request handlingJohan Hedberg2014-07-091-52/+60
| * Bluetooth: Fix incorrectly setting HCI_CONNECTABLEJohan Hedberg2014-07-091-0/+8
| * Bluetooth: Update page scan when necessary for Add/Remove DeviceJohan Hedberg2014-07-091-0/+34
| * Bluetooth: Introduce a whitelist for BR/EDR devicesJohan Hedberg2014-07-092-2/+73
| * Bluetooth: Unify helpers for bdaddr_list manipulationsJohan Hedberg2014-07-095-86/+31
| * Bluetooth: Fix enabling Authenticated Payload Timeout Expired eventMarcel Holtmann2014-07-091-1/+1
| * Bluetooth: Fix clearing HCI_LE_ADV for LE connectionsJohan Hedberg2014-07-081-0/+5
OpenPOWER on IntegriCloud