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 Torvalds2012-12-131-1/+8
|\
| *-. Merge branches 'for-3.7/upstream-fixes', 'for-3.8/hidraw', 'for-3.8/i2c-hid',...Jiri Kosina2012-12-1217-155/+558
| |\ \
| | | * HID: hidp: fallback to input session properly if hid is blacklistedLamarque V. Souza2012-12-071-1/+8
| | |/ | |/|
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-12-036-74/+187
|\ \ \
| * | | Revert "Bluetooth: Fix possible deadlock in SCO code"Gustavo Padovan2012-12-031-9/+10
| * | | Bluetooth: trivial: Change NO_FCS_RECV to RECV_NO_FCSAndrei Emeltchenko2012-12-031-5/+5
| * | | Bluetooth: Process receiving FCS_NONE in L2CAP Conf RspAndrei Emeltchenko2012-12-031-0/+7
| * | | Bluetooth: Fix missing L2CAP EWS Conf parameterAndrei Emeltchenko2012-12-031-17/+15Star
| * | | Bluetooth: AMP: Check that AMP is present and activeAndrei Emeltchenko2012-12-031-0/+1
| * | | Bluetooth: AMP: Mark controller radio powered down after HCIDEVDOWNAndrei Emeltchenko2012-12-031-0/+3
| * | | Bluetooth: Refactor l2cap_send_disconn_reqAndrei Emeltchenko2012-12-031-30/+26Star
| * | | Bluetooth: Move double negation to macrosGustavo Padovan2012-12-032-7/+7
| * | | Bluetooth: Implement deferred sco socket setupFrédéric Dalleau2012-12-032-7/+80
| * | | Bluetooth: Add BT_DEFER_SETUP option to sco socketFrédéric Dalleau2012-12-031-0/+32
| * | | Bluetooth: cancel power_on work when unregistering the deviceGustavo Padovan2012-12-031-0/+2
| * | | Bluetooth: Add missing lock nesting notationGustavo Padovan2012-12-031-2/+2
* | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-11-215-27/+177
|\| | |
| * | | Bluetooth: Remove OOB data if device was discovered in bandSzymon Janc2012-11-201-0/+2
| * | | Bluetooth: AMP: Set no FCS for incoming L2CAP chanAndrei Emeltchenko2012-11-201-0/+1
| * | | Bluetooth: Improve error message printingAndrei Emeltchenko2012-11-201-1/+1
| * | | Bluetooth: Set local_amp_id after getting Phylink Completed evtAndrei Emeltchenko2012-11-201-0/+1
| * | | Bluetooth: Fix sending L2CAP Create Chan ReqAndrei Emeltchenko2012-11-201-11/+18
| * | | Bluetooth: trivial: Use __constant for constantsAndrei Emeltchenko2012-11-191-4/+4
| * | | Bluetooth: Disable FCS only for new HS channelsAndrei Emeltchenko2012-11-192-1/+2
| * | | Bluetooth: Refactor locking in amp_physical_cfmAndrei Emeltchenko2012-11-192-6/+7
| * | | Bluetooth: Remove unneeded local_amp_id initializationAndrei Emeltchenko2012-11-191-1/+0Star
| * | | Bluetooth: Use __l2cap_no_conn_pending helperAndrei Emeltchenko2012-11-191-1/+1
| * | | Bluetooth: Fix updating advertising state flags and dataJohan Hedberg2012-11-191-0/+31
| * | | Bluetooth: Add support for setting LE advertising dataJohan Hedberg2012-11-192-1/+104
| * | | Bluetooth: Use proper invalid value for tx_powerJohan Hedberg2012-11-193-1/+5
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-11-213-8/+10
|\ \ \ \ | |/ / / |/| | |
| * | | Bluetooth: Fix memory leak when removing a UUIDJohan Hedberg2012-11-091-0/+1
| * | | Bluetooth: Notify about device registration before power onMarcel Holtmann2012-11-091-2/+2
| * | | Bluetooth: Fix error status when pairing failsPaulo Sérgio2012-11-091-1/+1
| * | | Bluetooth: Fix having bogus entries in mgmt_read_index_list replyJohan Hedberg2012-11-091-5/+6
| | |/ | |/|
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-11-1412-174/+1412
|\ \ \
| * | | Bluetooth: Rename ctrl_id to remote_amp_idAndrei Emeltchenko2012-11-013-6/+5Star
| * | | Bluetooth: Process Create Chan RequestAndrei Emeltchenko2012-11-011-20/+43
| * | | Bluetooth: AMP: Use l2cap_physical_cfm in phylink complete evtAndrei Emeltchenko2012-11-012-13/+26
| * | | Bluetooth: AMP: Check for hs_hcon instead of ctrl_idAndrei Emeltchenko2012-11-011-2/+2
| * | | Bluetooth: Disconnect logical link when deleting chanAndrei Emeltchenko2012-11-012-0/+21
| * | | Bluetooth: AMP: Remove hci_conn receiving error command statusAndrei Emeltchenko2012-11-011-4/+13
| * | | Bluetooth: AMP: Process Disc Physical Link Complete evtAndrei Emeltchenko2012-11-011-0/+26
| * | | Bluetooth: AMP: Process Disc Logical LinkAndrei Emeltchenko2012-11-012-0/+35
| * | | Bluetooth: AMP: Add Logical Link Create functionAndrei Emeltchenko2012-11-013-5/+72
| * | | Bluetooth: Derive remote and local amp id from chan structAndrei Emeltchenko2012-11-011-2/+4
| * | | Bluetooth: Return correct L2CAP response typeAndrei Emeltchenko2012-11-011-1/+10
| * | | Bluetooth: Save hs_hchan instead of hs_hcon in loglink completeAndrei Emeltchenko2012-11-011-1/+1
| * | | Bluetooth: trivial: Fix braces style and remove empty lineAndrei Emeltchenko2012-11-011-2/+2
| * | | Bluetooth: mgmt: Use __constant when dealing with constantsSyam Sidhardhan2012-11-011-5/+5