summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* 9p: Make all client spin locks IRQ safeTom Tucker2008-11-051-4/+6
* 9p: rdma: Set trans prior to requesting async connection opsTom Tucker2008-11-051-1/+3
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-11-043-10/+24
|\
| * xfrm: Fix xfrm_policy_gc_lock handling.Alexey Dobriyan2008-11-031-2/+2
| * XFRM: copy_to_user_kmaddress() reports local address twiceArnaud Ebalard2008-11-031-1/+1
| * udp: Fix the SNMP counter of UDP_MIB_INERRORSWei Yongjun2008-11-021-2/+8
| * udp: Fix the SNMP counter of UDP_MIB_INDATAGRAMSWei Yongjun2008-11-021-5/+13
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-11-0212-17/+89
|\|
| * af_unix: netns: fix problem of return valueJianjun Kong2008-11-011-1/+1
| * udp: multicast packets need to check namespaceEric Dumazet2008-11-012-9/+11
| * net: add documentation for skb recyclingStephen Hemminger2008-11-011-0/+12
| * key: fix setkey(8) policy set breakageAlexey Dobriyan2008-10-311-1/+0
| * xfrm: do not leak ESRCH to user spacefernando@oss.ntt.co2008-10-311-0/+2
| * Merge branch 'master' of git://git.infradead.org/users/pcmoore/lblnet-2.6David S. Miller2008-10-304-4/+29
| |\
| | * netlabel: Fix compilation warnings in net/netlabel/netlabel_addrlist.cManish Katiyar2008-10-302-0/+24
| | * netlabel: Fix compiler warnings in netlabel_mgmt.cPaul Moore2008-10-291-1/+1
| | * cipso: unsigned buf_len cannot be negativeroel kluin2008-10-291-3/+4
| * | netfilter: nf_conntrack_proto_gre: switch to register_pernet_gen_subsys()Alexey Dobriyan2008-10-301-2/+2
| * | netns: add register_pernet_gen_subsys/unregister_pernet_gen_subsysAlexey Dobriyan2008-10-301-0/+32
* | | saner FASYNC handling on file closeAl Viro2008-11-011-1/+0
|/ /
* | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2008-10-302-18/+58
|\ \
| * | SUNRPC: Fix potential race in put_rpccred()Trond Myklebust2008-10-281-1/+1
| * | SUNRPC: Fix rpcauth_prune_expiredTrond Myklebust2008-10-281-7/+9
| * | SUNRPC: Respond promptly to server TCP resetsTrond Myklebust2008-10-281-10/+48
| |/
* | pktgen: fix multiple queue warningJesse Brandeburg2008-10-281-14/+13
* | mac80211: correct warnings in minstrel rate control algorithmJohn W. Linville2008-10-271-3/+3
* | RFKILL: fix input layer initialisationDmitry Baryshkov2008-10-271-0/+5
|/
* syncookies: fix inclusion of tcp options in syn-ackFlorian Westphal2008-10-261-5/+5
* Phonet: do not reply to indication reset packetsRemi Denis-Courmont2008-10-261-1/+4
* wireless: fix regression caused by regulatory config optionArjan van de Ven2008-10-261-6/+5
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-10-237-79/+157
|\
| * tcp: Restore ordering of TCP options for the sake of inter-operabilityIlpo Järvinen2008-10-231-6/+17
| * net: Fix disjunct computation of netdev featuresHerbert Xu2008-10-233-69/+82
| * sctp: Fix to handle SHUTDOWN in SHUTDOWN_RECEIVED stateWei Yongjun2008-10-232-1/+46
| * sctp: Fix to handle SHUTDOWN in SHUTDOWN-PENDING stateWei Yongjun2008-10-231-1/+1
| * sctp: Add check for the TSN field of the SHUTDOWN chunkWei Yongjun2008-10-231-0/+9
| * sctp: Drop ICMP packet too big message with MTU larger than current PMTUWei Yongjun2008-10-231-1/+1
| * tcp: should use number of sack blocks instead of -1Ilpo Järvinen2008-10-211-1/+1
* | Merge branch 'v28-range-hrtimers-for-linus-v2' of git://git.kernel.org/pub/sc...Linus Torvalds2008-10-231-3/+4
|\ \
| * \ Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2Thomas Gleixner2008-10-221-3/+4
| |\ \ | | |/ | |/|
| | * Merge commit 'linus/master' into merge-linusArjan van de Ven2008-10-17416-13790/+29078
| | |\
| | * | hrtimer: convert net::sched_cbq to the new hrtimer apisArjan van de Ven2008-09-051-3/+4
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2008-10-231-8/+10
|\ \ \ \
| * | | | [PATCH] assorted path_lookup() -> kern_path() conversionsAl Viro2008-10-231-8/+10
| |/ / /
* | | | 9p: fix sparse warningsEric Van Hensbergen2008-10-222-12/+13
* | | | 9p: rdma: RDMA Transport Support for 9PTom Tucker2008-10-223-0/+722
* | | | 9p: fix debug build errorEric Van Hensbergen2008-10-222-3/+10
|/ / /
* | | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/eric...Linus Torvalds2008-10-2010-3234/+1930
|\ \ \
| * | | 9p: add more conservative lockingEric Van Hensbergen2008-10-171-7/+17
| * | | 9p: fix oops in protocol stat parsing error path.Eric Van Hensbergen2008-10-171-2/+2