summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* net: reintroduce missing rcu_assign_pointer() callsEric Dumazet2012-01-1232-63/+61
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2012-01-1211-56/+86
|\
| * mac80211: fix rx->key NULL pointer dereference in promiscuous modeStanislaw Gruszka2012-01-111-1/+1
| * nl80211: fix old station flags compatibilityJohannes Berg2012-01-111-4/+30
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...John W. Linville2012-01-109-51/+55
| |\
| | * Bluetooth: Correct packet len calculationAndrei Emeltchenko2012-01-031-5/+4
| | * Bluetooth: Keep chan->state and sk->sk_state in syncGustavo F. Padovan2012-01-031-0/+2
| | * Bluetooth: Don't use *_bh locks anymoreGustavo F. Padovan2012-01-031-12/+12
| | * Bluetooth: Fix mgmt_stop_discovery_failed()Andre Guedes2012-01-031-1/+1
| | * Bluetooth: Queue adv_work on system workqueueAndre Guedes2012-01-021-2/+1
| | * Bluetooth: Fix adv_work delayAndre Guedes2012-01-021-2/+1
| | * Bluetooth: Fix hci_cc_read_local_ext_features()Andre Guedes2012-01-021-1/+8
| | * Bluetooth: Rename extfeaturesAndre Guedes2012-01-022-2/+2
| | * Bluetooth: Remove *_bh from socket list lock.Gustavo F. Padovan2012-01-021-4/+4
| | * Bluetooth: Remove local_bh_disable() from hci_sock.cGustavo F. Padovan2012-01-021-2/+0
| | * Bluetooth: Remove *_bh locks from SCOGustavo F. Padovan2012-01-021-4/+4
| | * Bluetooth: Fix context in RFCOMM ttyGustavo F. Padovan2012-01-021-11/+11
| | * Bluetooth: Fix context in rfcomm_sock_lockGustavo F. Padovan2012-01-021-6/+6
| | * Bluetooth: Fix bacpy in l2cap_core.cGustavo F. Padovan2012-01-021-1/+1
* | | inet_diag: Rename inet_diag_req_compat into inet_diag_reqPavel Emelyanov2012-01-111-4/+4
* | | inet_diag: Rename inet_diag_req into inet_diag_req_v2Pavel Emelyanov2012-01-114-28/+28
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-01-096-12/+27
|\ \ \ | |/ /
| * | igmp: Avoid zero delay when receiving odd mixture of IGMP queriesBen Hutchings2012-01-091-0/+2
| * | net: Fix build with INET disabled.David S. Miller2012-01-091-0/+1
| * | net: introduce netif_addr_lock_nested() and call if when appropriateJiri Pirko2012-01-091-6/+6
| * | net: correct lock name in dev_[uc/mc]_sync documentations.Jiri Pirko2012-01-091-2/+2
| * | net: sk_update_clone is only used in net/core/sock.cStephen Rothwell2012-01-081-0/+6
| * | pktgen: set correct max and min in pktgen_setup_inject()Dan Carpenter2012-01-071-2/+2
| * | net: Default UDP and UNIX diag to 'n'.David S. Miller2012-01-072-2/+6
| * | net: fix sock_clone reference mismatch with tcp memcontrolGlauber Costa2012-01-071-0/+2
* | | Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/pe...Linus Torvalds2012-01-092-4/+4
|\ \ \
| * | | percpu: Remove irqsafe_cpu_xxx variantsChristoph Lameter2011-12-222-4/+4
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-085-6/+3
|\ \ \ \
| * | | | mac80211: drop spelling fixJiri Kosina2011-12-121-1/+1
| * | | | typo fixes: aera -> area, exntension -> extensionWang YanQing2011-12-091-1/+1
| * | | | treewide: Fix typos in various parts of the kernel, and fix some comments.Justin P. Mattock2011-12-023-3/+3
| * | | | drop "select GCD" from three Kconfig filesPaul Bolle2011-11-131-1/+0
| * | | | Merge branch 'master' into for-nextJiri Kosina2011-11-13448-6379/+15558
| |\ \ \ \
| * | | | | Kconfig: remove a few puzzling commentsPaul Bolle2011-10-311-2/+0
* | | | | | Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-01-081-1/+2
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'pm-sleep' into pm-for-linusRafael J. Wysocki2011-12-251-1/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' into pm-sleepRafael J. Wysocki2011-12-2160-324/+514
| | |\ \ \ \ \ \
| | * | | | | | | Freezer / sunrpc / NFS: don't allow TASK_KILLABLE sleeps to block the freezerJeff Layton2011-12-061-1/+2
* | | | | | | | | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2012-01-083-4/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | |
| * | | | | | | | switch ->path_mknod() to umode_tAl Viro2012-01-031-1/+1
| * | | | | | | | sunrpc: propagate umode_tAl Viro2012-01-032-2/+2
| * | | | | | | | vfs: fix the stupidity with i_dentry in inode destructorsAl Viro2012-01-031-1/+0
* | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-01-06432-11004/+24072
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | net_sched: red: split red_parms into parms and varsEric Dumazet2012-01-053-52/+62
| * | | | | | | | | net_sched: sfq: extend limitsEric Dumazet2012-01-051-58/+117
OpenPOWER on IntegriCloud