summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* net: fix some sparse errorsEric Dumazet2012-01-171-1/+1
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-01-122-3/+4
|\
| * net_sched: sfq: add optional RED on top of SFQEric Dumazet2012-01-121-1/+2
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2012-01-121-2/+2
| |\
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...John W. Linville2012-01-101-2/+2
| | |\
| | | * Bluetooth: Rename extfeaturesAndre Guedes2012-01-021-2/+2
| | * | net: sk_update_clone is only used in net/core/sock.cStephen Rothwell2012-01-081-6/+0
| | * | net: fix sock_clone reference mismatch with tcp memcontrolGlauber Costa2012-01-071-0/+6
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri...Linus Torvalds2012-01-101-21/+7
|\ \ \ \ | |/ / / |/| | |
| * | | 9p: Reduce object size with CONFIG_NET_9P_DEBUGJoe Perches2012-01-051-21/+7
* | | | Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/pe...Linus Torvalds2012-01-091-7/+7
|\ \ \ \
| * | | | percpu: Remove irqsafe_cpu_xxx variantsChristoph Lameter2011-12-221-7/+7
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-081-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | treewide: Fix typos in various parts of the kernel, and fix some comments.Justin P. Mattock2011-12-021-1/+1
* | | | | net_sched: red: split red_parms into parms and varsEric Dumazet2012-01-051-43/+55
* | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-01-053-30/+28
|\ \ \ \ \
| * | | | | NFC: Export a new attribute nfcid1 in target infoIlan Elias2012-01-041-0/+3
| * | | | | NFC: Handle error during NCI data exchangeIlan Elias2012-01-041-0/+6
| * | | | | NFC: Update names and structs to NCI spec 1.0 d22Ilan Elias2012-01-042-30/+19
| | |_|_|/ | |/| | |
* | | | | ipv6: Check RA for sllao when configuring optimistic ipv6 address (v2)Neil Horman2012-01-041-1/+2
* | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-01-038-271/+309
|\| | | |
| * | | | Bluetooth: remove *_bh usage from hci_dev_list and hci_cb_listGustavo F. Padovan2011-12-221-8/+8
| * | | | Bluetooth: Remove lock from inquiry_cacheGustavo F. Padovan2011-12-221-7/+0
| * | | | Bluetooth: Add MITM mechanism to LE-SMPBrian Gix2011-12-222-0/+7
| * | | | Bluetooth: Fix deadlocks with sock lock and L2CAP timers locksUlisses Furquim2011-12-221-8/+21
| * | | | Bluetooth: Make HCI call directly into SCO and L2CAP event functionsUlisses Furquim2011-12-221-79/+59
| * | | | Bluetooth: Remove magic numbers from le scan cmdAndrei Emeltchenko2011-12-221-0/+3
| * | | | Bluetooth: Always compile SCO and L2CAP in Bluetooth CoreUlisses Furquim2011-12-211-22/+0
| * | | | Bluetooth: Rename info_work to info_timerGustavo F. Padovan2011-12-201-1/+1
| * | | | Bluetooth: convert security timer to delayed_workGustavo F. Padovan2011-12-201-1/+1
| * | | | Bluetooth: Move l2cap_{set,clear}_timer to l2cap.hGustavo F. Padovan2011-12-201-0/+15
| * | | | Bluetooth: Clean up magic pointersAndrei Emeltchenko2011-12-201-1/+6
| * | | | Bluetooth: Initialize default flow control modeAndrei Emeltchenko2011-12-201-0/+4
| * | | | mac80211: handle SMPS action framesJohannes Berg2011-12-191-1/+4
| * | | | cfg80211: Return beacon loss count in stationPaul Stewart2011-12-191-1/+6
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...John W. Linville2011-12-194-155/+187
| |\ \ \ \
| | * | | | Bluetooth: Add missing mgmt_confirm_name command definitionJohan Hedberg2011-12-191-0/+10
| | * | | | Bluetooth: Fix mgmt_(block,unblock)_device opcodesJohan Hedberg2011-12-191-2/+2
| | * | | | Bluetooth: Add missing confirm_name field to mgmt_ev_device_foundJohan Hedberg2011-12-191-0/+1
| | * | | | Bluetooth: Add HCI Read Data Block Size functionAndrei Emeltchenko2011-12-182-0/+13
| | * | | | Bluetooth: Update ordering and opcodes of mgmt messagesJohan Hedberg2011-12-181-66/+81
| | * | | | Bluetooth: Add timer for automatically disabling the service cacheJohan Hedberg2011-12-181-0/+2
| | * | | | Bluetooth: Remove mgmt_set_service_cacheJohan Hedberg2011-12-182-5/+4
| | * | | | Bluetooth: Move mgmt_set_fast_connectable to the right locationJohan Hedberg2011-12-181-5/+2
| | * | | | Bluetooth: Update mgmt_read_info and related mgmt messagesJohan Hedberg2011-12-182-11/+19
| | * | | | Bluetooth: Remove work_add and work_del from hci_sysfsGustavo F. Padovan2011-12-181-3/+0
| | * | | | Bluetooth: invert locking order in connect pathGustavo F. Padovan2011-12-181-1/+2
| | * | | | Bluetooth: convert info timer to delayed_workGustavo F. Padovan2011-12-181-1/+1
| | * | | | Bluetooth: convert tx_task to workqueueGustavo F. Padovan2011-12-181-1/+1
| | * | | | Bluetooth: Move command task to workqueueGustavo F. Padovan2011-12-181-1/+1