summaryrefslogtreecommitdiffstats
path: root/net/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2013-09-061-5/+10
|\
| * Merge branch 'master' into for-3.12/upstreamJiri Kosina2013-09-046-332/+325
| |\
| * | HID: fix unused rsize usageJiri Kosina2013-07-221-0/+1
| * | HID: fix data access in implement()Jiri Kosina2013-07-221-5/+9
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-09-057-200/+304
|\ \ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2013-08-227-200/+304
| |\ \ \ | | |_|/ | |/| |
| | * | Bluetooth: Add SCO connection fallbackFrédéric Dalleau2013-08-212-11/+39
| | * | Bluetooth: Handle specific error for SCO connection fallbackFrédéric Dalleau2013-08-211-0/+1
| | * | Bluetooth: Prevent transparent SCO on older devicesFrédéric Dalleau2013-08-211-0/+6
| | * | Bluetooth: Parameters for outgoing SCO connectionsFrédéric Dalleau2013-08-212-6/+20
| | * | Bluetooth: Use voice setting in deferred SCO connection requestFrédéric Dalleau2013-08-211-5/+17
| | * | Bluetooth: Add Bluetooth socket voice optionFrédéric Dalleau2013-08-211-1/+39
| | * | Bluetooth: Remove unused mask parameter in sco_conn_defer_acceptFrédéric Dalleau2013-08-211-7/+3
| | * | Bluetooth: Use hci_connect_sco directlyFrédéric Dalleau2013-08-212-8/+3
| | * | Bluetooth: Purge the dlc->tx_queue to avoid circular dependencyGianluca Anzolin2013-08-211-0/+6
| | * | Bluetooth: Fix the reference counting of tty_portGianluca Anzolin2013-08-211-34/+12
| | * | Bluetooth: Implement .activate, .shutdown and .carrier_raised methodsGianluca Anzolin2013-08-211-70/+47
| | * | Bluetooth: Move the tty initialization and cleanup out of open/closeGianluca Anzolin2013-08-211-42/+72
| | * | Bluetooth: Remove the device from the list in the destructorGianluca Anzolin2013-08-211-21/+6
| | * | Bluetooth: Take proper tty_struct referencesGianluca Anzolin2013-08-211-12/+17
| | * | Bluetooth: Set different event mask for LE-only controllersMarcel Holtmann2013-08-211-0/+12
| | * | Bluetooth: Fix getting SCO socket options in deferred stateJohan Hedberg2013-08-211-2/+6
| | * | Bluetooth: hidp: remove wrong send_report at initBenjamin Tissoires2013-07-251-14/+0
| | * | Bluetooth: hidp: implement hidinput_input_event callbackBenjamin Tissoires2013-07-251-0/+26
| | * | Bluetooth: Add missing braces to an "else if"Gustavo Padovan2013-07-251-1/+2
| | * | Bluetooth: Use defines instead of integer literalsMikel Astiz2013-07-251-4/+5
| | * | Bluetooth: Use defines in in hci_get_auth_req()Mikel Astiz2013-07-251-5/+8
| | * | Bluetooth: Fix simple whitespace vs tab style issueMarcel Holtmann2013-07-251-1/+1
* | | | Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2013-09-041-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | PTR_RET is now PTR_ERR_OR_ZERO(): Replace most.Rusty Russell2013-07-151-1/+1
| |/ /
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2013-07-311-9/+17
|\ \ \ | |/ / |/| |
| * | Bluetooth: Fix calling request callback more than onceJohan Hedberg2013-07-291-1/+9
| * | Bluetooth: Fix HCI init for BlueFRITZ! devicesJohan Hedberg2013-07-291-1/+4
| * | Bluetooth: Fix race between hci_register_dev() and hci_dev_open()Gustavo Padovan2013-07-251-7/+4
| * | Bluetooth: Fix invalid length check in l2cap_information_rsp()Jaganath Kanakkassery2013-07-251-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-07-096-323/+308
|\ \ \ | |_|/ |/| |
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-06-261-1/+1
| |\ \
| * | | Bluetooth: Improve comments on the HCI_Delete_Store_Link_Key issueGustavo Padovan2013-06-231-1/+9
| * | | Bluetooth: hidp: using strlcpy instead of strncpy, also beautify code.Chen Gang2013-06-231-10/+4
| * | | Bluetooth: Remove unneeded flagAndrei Emeltchenko2013-06-231-2/+0
| * | | Bluetooth: Use HCI_MGMT instead of HCI_LINK_KEYS flagAndrei Emeltchenko2013-06-231-2/+2
| * | | Bluetooth: Mgmt Device Found EventAndre Guedes2013-06-231-0/+3
| * | | Bluetooth: Remove empty event handlerAndre Guedes2013-06-231-12/+0
| * | | Bluetooth: Remove inquiry helpersAndre Guedes2013-06-231-30/+0
| * | | Bluetooth: Remove LE scan helpersAndre Guedes2013-06-231-113/+0
| * | | Bluetooth: Refactor hci_cc_le_set_scan_enableAndre Guedes2013-06-231-6/+3
| * | | Bluetooth: Make mgmt_stop_discovery_failed staticAndre Guedes2013-06-231-16/+16
| * | | Bluetooth: Remove stop discovery handling from hci_event.cAndre Guedes2013-06-231-14/+2
| * | | Bluetooth: Update stop_discovery to use HCI requestAndre Guedes2013-06-231-7/+40
| * | | Bluetooth: Use HCI request in interleaved discoveryAndre Guedes2013-06-233-28/+64
OpenPOWER on IntegriCloud