summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/eri...Linus Torvalds2012-01-108-216/+248
|\
| * 9p: Reduce object size with CONFIG_NET_9P_DEBUGJoe Perches2012-01-058-216/+248
* | Merge branch 'nfs-for-3.3' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2012-01-103-20/+29
|\ \
| * | NFSv4: include bitmap in nfsv4 get acl dataAndy Adamson2012-01-051-1/+2
| * | SUNRPC: Clean up the RPCSEC_GSS service ticket requestsTrond Myklebust2012-01-052-19/+27
| |/
* | 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
| * | | | | | | | | net_sched: Bug in netem reorderingHagen Paul Pfeifer2012-01-051-2/+2
| * | | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-01-0518-102/+149
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | mac80211: remove dead codeMohammed Shafi Shajakhan2012-01-042-19/+0
| | * | | | | | | | | mac80211: Call driver commands after drv_start in mac80211 restart codeYogesh Ashok Powar2012-01-041-10/+9
| | * | | | | | | | | mac80211: use RCU read locks for sta_info_getMohammed Shafi Shajakhan2012-01-041-0/+2
| | * | | | | | | | | mac80211: fix kernel panic in IBSS due to a regressionMohammed Shafi Shajakhan2012-01-041-1/+4
| | * | | | | | | | | mac80211: fix scan state machineMohammed Shafi Shajakhan2012-01-041-1/+1
| | * | | | | | | | | net/rfkill/rfkill-gpio.c: introduce missing kfreeJulia Lawall2012-01-041-1/+1
| | * | | | | | | | | mac80211: always clear SDATA_STATE_OFFCHANNEL flagEliad Peller2012-01-041-1/+3
| | * | | | | | | | | wireless: Treat IPv6 diffserv the same as IPv4 for 802.11eDave Täht2012-01-041-1/+5
| | * | | | | | | | | NFC: Export a new attribute nfcid1 in target infoIlan Elias2012-01-042-0/+9
| | * | | | | | | | | cfg80211: relicense reg.c reg.h and genregdb.awk to ISCLuis R. Rodriguez2012-01-044-7/+54
| | * | | | | | | | | cfg80211: replace reg.c Nokia commit 269ac5Luis R. Rodriguez2012-01-041-3/+3
| | * | | | | | | | | cfg80211: replace reg.c Nokia commit c4c32294Luis R. Rodriguez2012-01-041-6/+6
| | * | | | | | | | | NFC: Handle error during NCI data exchangeIlan Elias2012-01-041-0/+18
| | * | | | | | | | | NFC: Update names and structs to NCI spec 1.0 d22Ilan Elias2012-01-044-31/+30
OpenPOWER on IntegriCloud