aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* tracing/events: move trace point headers into include/trace/eventsSteven Rostedt2009-04-143-3/+3
* tracing: create automated trace definesSteven Rostedt2009-04-141-2/+2
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2009-04-083-25/+9
|\
| * netfilter: ctnetlink: fix regression in expectation handlingPablo Neira Ayuso2009-04-061-24/+6
| * netfilter: fix selection of "LED" target in netfilterAlex Riesen2009-04-061-1/+1
| * netfilter: ip6tables regression fixEric Dumazet2009-04-061-0/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-04-063-4/+5
|\ \
| * | xfrm: fix fragmentation on inter family tunnelsSteffen Klassert2009-04-061-0/+1
| * | net/802/fddi.c: add MODULE_LICENSEAdrian Bunk2009-04-061-0/+2
| * | socket: use percpu_add() while updating sockets_in_useEric Dumazet2009-04-041-4/+2
* | | Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2009-04-063-38/+127
|\ \ \ | |_|/ |/| |
| * | nfsd: don't use the deferral service, return NFS4ERR_DELAYAndy Adamson2009-04-032-1/+3
| * | sunrpc/svc.c: Remove unused line 'rqstp->rq_server = serv;' in svc_processideawu2009-03-271-1/+0
| * | svcrpc: take advantage of tcp autotuningOlga Kornievskaia2009-03-181-28/+7
| * | knfsd: add file to export stats about nfsd poolsGreg Banks2009-03-181-1/+99
| * | knfsd: avoid overloading the CPU scheduler with enormous load averagesGreg Banks2009-03-181-7/+18
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumaskLinus Torvalds2009-04-051-2/+1
|\ \ \
| * \ \ Merge branch 'cpumask-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Rusty Russell2009-03-311-2/+1
| |\ \ \
| | * \ \ Merge branch 'linus' into cpumask-for-linusIngo Molnar2009-03-30350-8195/+31016
| | |\ \ \
| | * | | | cpumask: replace node_to_cpumask with cpumask_of_node.Rusty Russell2009-03-131-2/+1
| | | | | |
| | | \ \ \
| | | \ \ \
| | | \ \ \
| | *---. \ \ \ Merge branches 'x86/cleanups', 'x86/kexec', 'x86/mce2' and 'linus' into x86/coreIngo Molnar2009-03-1117-129/+140
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-04-037-15/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | trivial: fix typos/grammar errors in Kconfig textsMatt LaPlante2009-03-307-15/+15
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2009-04-021-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | New helper - current_umask()Al Viro2009-03-311-1/+1
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-04-0219-158/+264
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | tcp: miscounts due to tcp_fragment pcount resetIlpo Järvinen2009-04-021-1/+6
| * | | | | | | | tcp: add helper for counter tweaking due mid-wq changeIlpo Järvinen2009-04-021-32/+34
| * | | | | | | | net: allow multiple dev per napi with GROStephen Hemminger2009-04-021-2/+3
| * | | | | | | | netfilter: use rcu_read_bh() in ipt_do_table()Eric Dumazet2009-04-023-6/+6
| * | | | | | | | RDS: Use spinlock to protect 64b value update on 32b archsAndy Grover2009-04-027-24/+100
| * | | | | | | | RDS: Rewrite connection cleanup, fixing oops on rmmodAndy Grover2009-04-028-85/+109
| * | | | | | | | RDS: Fix m_rs_lock deadlockAndy Grover2009-04-021-3/+3
| * | | | | | | | core: remove pointless conditional before kfree()Wei Yongjun2009-03-311-2/+1
| * | | | | | | | ipv4: remove unused parameter from tcp_recv_urg().Rami Rosen2009-03-311-3/+2
* | | | | | | | | Merge branch 'devel' into for-linusTrond Myklebust2009-04-0110-383/+505
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | SUNRPC: Ensure IPV6_V6ONLY is set on the socket before binding to a portTrond Myklebust2009-04-011-12/+24
| * | | | | | | | | SUNRPC: Remove CONFIG_SUNRPC_REGISTER_V4Chuck Lever2009-03-281-22/+0
| * | | | | | | | | SUNRPC: rpcb_register() should handle errors silentlyChuck Lever2009-03-282-8/+12
| * | | | | | | | | SUNRPC: Simplify kernel RPC service registrationChuck Lever2009-03-281-45/+34
| * | | | | | | | | SUNRPC: Simplify svc_unregister()Chuck Lever2009-03-281-21/+14
| * | | | | | | | | SUNRPC: Allow callers to pass rpcb_v4_register a NULL addressChuck Lever2009-03-281-10/+28
| * | | | | | | | | SUNRPC: rpcbind actually interprets r_owner stringChuck Lever2009-03-281-3/+10
| * | | | | | | | | SUNRPC: Clean up address type casts in rpcb_v4_register()Chuck Lever2009-03-281-14/+12
| * | | | | | | | | SUNRPC: Don't return EPROTONOSUPPORT in svc_register()'s helpersChuck Lever2009-03-281-2/+2
| * | | | | | | | | SUNRPC: Use IPv4 loopback for registering AF_INET6 kernel RPC servicesChuck Lever2009-03-281-17/+6
| * | | | | | | | | SUNRPC: Set IPV6ONLY flag on PF_INET6 RPC listener socketsChuck Lever2009-03-281-6/+4
| * | | | | | | | | SUNRPC: Remove @family argument from svc_create() and svc_create_pooled()Chuck Lever2009-03-281-6/+5
| * | | | | | | | | SUNRPC: Change svc_create_xprt() to take a @family argumentChuck Lever2009-03-281-6/+9
| * | | | | | | | | SUNRPC: svc_setup_socket() gets protocol family from socketChuck Lever2009-03-281-3/+3