aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-05-231-1/+1
|\
| * Merge branch 'master' into upstream.Jiri Kosina2011-05-185-9/+20
| |\
| * | HID: bt: hidp.h: do not use a tab after a #defineAntonio Ospite2011-04-211-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-2019-1408/+2492
|\ \ \ | |_|/ |/| |
| * | bluetooth: Fix warnings in l2cap_core.cDavid S. Miller2011-05-161-2/+2
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-05-166-121/+171
| |\ \
| | * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...John W. Linville2011-05-126-121/+171
| | |\ \
| | | * | Bluetooth: Remove leftover debug messagesGustavo F. Padovan2011-05-121-3/+1
| | | * | Bluetooth: Add support for disconnecting LE links via mgmtVinicius Costa Gomes2011-05-111-0/+3
| | | * | Bluetooth: Add support for sending connection events for LE linksVinicius Costa Gomes2011-05-111-1/+4
| | | * | Bluetooth: Double check sec req for pre 2.1 deviceWaldemar Rymarkiewicz2011-05-112-1/+18
| | | * | Bluetooth: Remove l2cap_sk_listGustavo F. Padovan2011-05-052-79/+92
| | | * | Bluetooth: Handle psm == 0 case inside l2cap_add_psm()Gustavo F. Padovan2011-05-052-30/+24
| | | * | Bluetooth: Add l2cap_add_psm() and l2cap_add_scid()Gustavo F. Padovan2011-05-052-33/+55
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-05-0511-465/+842
| |\ \ \ \ | | |/ / /
| | * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...John W. Linville2011-04-2911-465/+842
| | |\ \ \ | | | |/ /
| | | * | Bluetooth: Fix updating conn->auth_type in hci_io_capa_request_evtJohan Hedberg2011-04-281-1/+2
| | | * | Bluetooth: Add store_hint parameter to mgmt_new_keyJohan Hedberg2011-04-282-10/+14
| | | * | Bluetooth: Remove old_key_type from mgmt_ev_new_keyJohan Hedberg2011-04-282-6/+6
| | | * | Bluetooth: Fix connection key type updating for buggy controllersJohan Hedberg2011-04-281-1/+4
| | | * | Bluetooth: Fix old_key_type logic for non-persistent keysJohan Hedberg2011-04-281-1/+1
| | | * | Bluetooth: Fix link key persistent storage criteriaJohan Hedberg2011-04-283-4/+54
| | | * | Bluetooth: Fix logic in hci_pin_code_request_evtJohan Hedberg2011-04-281-2/+1
| | | * | Bluetooth: Fix reason code for pairing rejectionJohan Hedberg2011-04-281-1/+1
| | | * | Bluetooth: Add confirm_hint parameter to user confirmation requestsJohan Hedberg2011-04-282-3/+17
| | | * | Bluetooth: Fix HCI_CONN_AUTH_PEND flag for all authentication requestsJohan Hedberg2011-04-281-2/+16
| | | * | Bluetooth: Add variable SSP auto-accept delay supportJohan Hedberg2011-04-283-1/+57
| | | * | Bluetooth: Add automated SSP user confirmation responsesJohan Hedberg2011-04-281-2/+35
| | | * | Bluetooth: Add secure flag for mgmt_pin_code_reqWaldemar Rymarkiewicz2011-04-282-3/+12
| | | * | Bluetooth: Respect local MITM req in io_cap replyWaldemar Rymarkiewicz2011-04-281-1/+1
| | | * | Bluetooth: Ignore key unauthenticated for high securityWaldemar Rymarkiewicz2011-04-281-4/+16
| | | * | Bluetooth: Map sec_level to link key requirementsWaldemar Rymarkiewicz2011-04-282-10/+55
| | | * | Bluetooth: Don't modify sec_level if auth failedWaldemar Rymarkiewicz2011-04-281-1/+0
| | | * | Bluetooth: Add definitions for link key typesWaldemar Rymarkiewicz2011-04-282-4/+5
| | | * | Bluetooth: Add discovering event to the Management interfaceJohan Hedberg2011-04-282-6/+40
| | | * | Bluetooth: Add basic discovery commands to the management interfaceJohan Hedberg2011-04-281-1/+75
| | | * | Bluetooth: Don't export l2cap_sock_opsGustavo F. Padovan2011-04-281-1/+3
| | | * | Bluetooth: Fix memory leak with L2CAP channelsGustavo F. Padovan2011-04-282-4/+8
| | | * | Bluetooth: Move conn to struct l2cap_chanGustavo F. Padovan2011-04-284-62/+55
| | | * | Bluetooth: Move more vars to struct l2cap_chanGustavo F. Padovan2011-04-282-70/+72
| | | * | Bluetooth: Move more channel info to struct l2cap_chanGustavo F. Padovan2011-04-285-103/+114
| | | * | Bluetooth: Move more vars to struct l2cap_chanGustavo F. Padovan2011-04-273-67/+68
| | | * | Bluetooth: Move some more elements to struct l2cap_chanGustavo F. Padovan2011-04-272-60/+70
| | | * | Bluetooth: Rename l2cap_do_connect() to l2cap_chan_connect()Gustavo F. Padovan2011-04-272-2/+2
| | | * | Bluetooth: Move conf_state to struct l2cap_chanGustavo F. Padovan2011-04-272-46/+52
| | | * | Bluetooth: Refactor L2CAP channel allocationGustavo F. Padovan2011-04-272-17/+17
| | | * | Merge master.kernel.org:/pub/scm/linux/kernel/git/padovan/bluetooth-2.6Gustavo F. Padovan2011-04-204-2/+11
| | | |\ \
| | * | \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-04-264-5/+12
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ /
| * | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-04-264-5/+12
| |\ \ \ \
| * | | | | bluetooth: Fix use-before-initiailized var.David S. Miller2011-04-251-1/+1