summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* ethtool: Allow drivers to select RX NFC rule locationsBen Hutchings2012-01-042-2/+11
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-01-0328-1135/+1282
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...John W. Linville2012-01-0215-329/+372
| |\
| | * Bluetooth: Fix a compile warning in RFCOMMGustavo F. Padovan2011-12-271-3/+0
| | * Bluetooth: Incorrect address while storing LTK.Hemant Gupta2011-12-231-1/+1
| | * Bluetooth: Don't disable interrupt when locking the queueGustavo F. Padovan2011-12-221-2/+2
| | * Bluetooth: remove *_bh usage from hci_dev_list and hci_cb_listGustavo F. Padovan2011-12-222-14/+14
| | * Bluetooth: add debug output to l2cap_ack_timeout()Gustavo F. Padovan2011-12-221-0/+2
| | * Bluetooth: Remove l2cap priority from inside RFCOMM.Gustavo F. Padovan2011-12-221-27/+17
| | * Bluetooth: Add SMP to User Passkey and ConfirmBrian Gix2011-12-221-1/+9
| | * Bluetooth: Add MITM mechanism to LE-SMPBrian Gix2011-12-221-22/+204
| | * Bluetooth: Fix deadlocks with sock lock and L2CAP timers locksUlisses Furquim2011-12-221-20/+9
| | * Bluetooth: Make HCI call directly into SCO and L2CAP event functionsUlisses Furquim2011-12-223-133/+15
| | * Bluetooth: Remove magic numbers from le scan cmdAndrei Emeltchenko2011-12-221-2/+10
| | * Bluetooth: fix bt_accept_dequeue() to work in process contextGustavo F. Padovan2011-12-221-7/+4
| | * Bluetooth: Always compile SCO and L2CAP in Bluetooth CoreUlisses Furquim2011-12-216-35/+15
| | * Bluetooth: Remove global mutex hci_task_lockUlisses Furquim2011-12-211-20/+1
| | * Bluetooth: Rename info_work to info_timerGustavo F. Padovan2011-12-201-7/+7
| | * Bluetooth: convert security timer to delayed_workGustavo F. Padovan2011-12-202-9/+10
| | * Bluetooth: Move l2cap_{set,clear}_timer to l2cap.hGustavo F. Padovan2011-12-201-14/+0
| | * Bluetooth: Clean up magic pointersAndrei Emeltchenko2011-12-201-4/+4
| | * Bluetooth: Check for flow control modeAndrei Emeltchenko2011-12-201-0/+5
| | * Bluetooth: Initialize default flow control modeAndrei Emeltchenko2011-12-201-0/+4
| | * Bluetooth: Split ctrl init to BREDR and AMP partsAndrei Emeltchenko2011-12-202-18/+49
| * | mac80211: Keep skb->piority for relayed frames in AP modeHelmut Schaa2011-12-211-1/+6
| * | mac80211: ibss should not purge clients it is not responsible forMarek Lindner2011-12-211-0/+3
| |/
| * mac80211: Fixing sparse warning at sta_info.cYogesh Ashok Powar2011-12-191-2/+7
| * NFC: use kfree_skb() for sk_buffsDan Carpenter2011-12-191-1/+1
| * NFC: double unlock in nfc_llcp_recv_connect()Dan Carpenter2011-12-191-3/+1
| * mac80211: handle SMPS action framesJohannes Berg2011-12-191-0/+58
| * NFC: Fix LLCP related build failureSamuel Ortiz2011-12-191-2/+2
| * cfg80211: Return beacon loss count in stationPaul Stewart2011-12-194-1/+16
| * mac80211: split addba retries in timeNikolay Martynov2011-12-192-1/+24
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...John W. Linville2011-12-1911-820/+828
| |\
| | * Merge git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetoothGustavo F. Padovan2011-12-193-2/+13
| | |\
| | * | Bluetooth: Incoming ACL packets do not force active modeMat Martineau2011-12-181-1/+1
| | * | Bluetooth: Simplify num_comp_pkts_evt functionAndrei Emeltchenko2011-12-181-18/+29
| | * | Bluetooth: Add HCI Read Data Block Size functionAndrei Emeltchenko2011-12-181-0/+26
| | * | Bluetooth: Use correct struct for user_confirm_neg_replyJohan Hedberg2011-12-181-1/+1
| | * | Bluetooth: Add timer for automatically disabling the service cacheJohan Hedberg2011-12-182-5/+38
| | * | Bluetooth: Move EIR and CoD update functions to a better positionJohan Hedberg2011-12-181-173/+173
| | * | Bluetooth: Remove mgmt_set_service_cacheJohan Hedberg2011-12-182-51/+12
| | * | Bluetooth: Move mgmt_set_fast_connectable to the right locationJohan Hedberg2011-12-181-6/+6
| | * | Bluetooth: Update mgmt_read_info and related mgmt messagesJohan Hedberg2011-12-181-52/+94
| | * | Bluetooth: Add ProFUSION's copyrightGustavo F. Padovan2011-12-183-0/+3
| | * | Bluetooth: Use system workqueue to schedule power_onGustavo F. Padovan2011-12-182-2/+2
| | * | Bluetooth: Remove work_add and work_del from hci_sysfsGustavo F. Padovan2011-12-181-44/+27
| | * | Bluetooth: Use new alloc_workqueue()Gustavo F. Padovan2011-12-181-1/+2
| | * | Bluetooth: move power_off to system workqueueGustavo F. Padovan2011-12-182-2/+2
| | * | Bluetooth: Change l2cap chan_list to use RCUGustavo F. Padovan2011-12-181-61/+58
OpenPOWER on IntegriCloud