summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-04-108-24/+44
|\
| * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-04-031-0/+2
| |\
| | * cfg80211: sched_scan_mtx lock in cfg80211_conn_work()Artem Savkov2013-03-301-0/+2
| * | Merge tag 'nfc-fixes-3.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-04-012-11/+3
| |\ \
| | * | NFC: llcp: Keep the connected socket parent pointer aliveSamuel Ortiz2013-03-261-1/+3
| | * | NFC: llcp: Remove possible double call to kfree_skbThierry Escande2013-03-201-2/+0
| | * | NFC: llcp: Detach socket from process context only when releasing the socketSamuel Ortiz2013-03-202-8/+0
| * | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-04-015-13/+39
| |\ \ \ | | | |/ | | |/|
| | * | mac80211: fix idle handling sequenceJohannes Berg2013-03-253-4/+16
| | * | mac80211: fix remain-on-channel cancel crashJohannes Berg2013-03-253-9/+23
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-03-2912-74/+145
|\ \ \ \ | |/ / /
| * | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2013-03-2512-76/+154
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * mac80211: Don't restart sta-timer if not associated.Ben Greear2013-03-242-3/+6
| | * cfg80211: always check for scan end on P2P deviceJohannes Berg2013-03-246-47/+92
| | * mac80211: fix virtual monitor interface lockingJohannes Berg2013-03-201-16/+19
| | * cfg80211: fix wdev tracing crashJohannes Berg2013-03-201-1/+2
| | * mac80211: fix crash with P2P Device returning action framesJohannes Berg2013-03-111-1/+13
| | * cfg80211: fix potential BSS memory leak and updateJohannes Berg2013-03-071-5/+11
| | * cfg80211: fix inconsistency in trace for rdev_set_mac_aclVladimir Kondratiev2013-03-071-1/+1
| | * mac80211: always synchronize_net() during station removalJohannes Berg2013-03-061-2/+10
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2013-03-181-0/+1
| |\ \
| | * | Bluetooth: Fix not closing SCO sockets in the BT_CONNECT2 stateVinicius Costa Gomes2013-03-141-0/+1
* | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2013-03-2516-971/+1272
|\ \ \ \
| * | | | Bluetooth: fix error return code in rfcomm_add_listener()Wei Yongjun2013-03-201-1/+3
| * | | | Bluetooth: Fix PIN/Confirm/Passkey response parametersJohan Hedberg2013-03-181-8/+12
| * | | | Bluetooth: Simplify address parameters of user_pairing_resp()Johan Hedberg2013-03-181-13/+14
| * | | | Bluetooth: Fix fast connectable state when enabling page scanJohan Hedberg2013-03-181-1/+16
| * | | | Bluetooth: Fix updating page scan parameters when not necessaryJohan Hedberg2013-03-181-2/+8
| * | | | Bluetooth: Update page scan parameters after successful write commandsJohan Hedberg2013-03-181-0/+43
| * | | | Bluetooth: Add reading of page scan parametersJohan Hedberg2013-03-182-0/+38
| * | | | Bluetooth: Disable fast connectable when disabling connectableJohan Hedberg2013-03-181-0/+3
| * | | | Bluetooth: Refactor fast connectable HCI commandsJohan Hedberg2013-03-181-19/+24
| * | | | Bluetooth: Add proper flag for fast connectable modeJohan Hedberg2013-03-181-0/+16
| * | | | Bluetooth: Fix error response for simultaneous fast connectable commandsJohan Hedberg2013-03-181-0/+6
| * | | | Bluetooth: Limit fast connectable support to >= 1.2 controllersJohan Hedberg2013-03-181-2/+3
| * | | | Bluetooth: Fix fast connectable response sendingJohan Hedberg2013-03-181-11/+42
| * | | | Bluetooth: Use an async request for mgmt_set_connectableJohan Hedberg2013-03-181-8/+29
| * | | | Bluetooth: Fix setting local name to the existing valueJohan Hedberg2013-03-181-0/+11
| * | | | Bluetooth: Fix local name setting for LE-only controllersJohan Hedberg2013-03-181-2/+9
| * | | | Bluetooth: Handle AD updating through an async requestJohan Hedberg2013-03-182-29/+19
| * | | | Bluetooth: Fix waiting for EIR update when setting local nameJohan Hedberg2013-03-181-47/+49
| * | | | Bluetooth: Fix clearing flags on power off before notifying mgmtJohan Hedberg2013-03-181-4/+4
| * | | | Bluetooth: Clear non-persistent flags when closing HCI deviceJohan Hedberg2013-03-181-0/+1
| * | | | Bluetooth: Add a define for the HCI persistent flags maskJohan Hedberg2013-03-181-1/+1
| * | | | Bluetooth: Remove useless HCI_PENDING_CLASS flagJohan Hedberg2013-03-182-6/+1
| * | | | Bluetooth: Fix UUID/class mgmt command response synchronizationJohan Hedberg2013-03-181-17/+56
| * | | | Bluetooth: Fix busy condition testing for EIR and class updatesJohan Hedberg2013-03-181-9/+36
| * | | | Bluetooth: Wait for HCI command completion with mgmt_set_poweredJohan Hedberg2013-03-181-12/+34
| * | | | Bluetooth: Update mgmt powered HCI commands to use async requestsJohan Hedberg2013-03-181-63/+100
| * | | | Bluetooth: Move power on HCI command updates to their own functionJohan Hedberg2013-03-181-36/+42
OpenPOWER on IntegriCloud