summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | | 9p: Improve debug supportEric Van Hensbergen2008-10-172-27/+70
| * | | 9p: eliminate depricated conv functionsEric Van Hensbergen2008-10-173-1055/+13
| * | | 9p: rework client code to use new protocol support functionsEric Van Hensbergen2008-10-175-515/+572
| * | | 9p: remove unnecessary tag field from p9_req_t structureEric Van Hensbergen2008-10-171-1/+1
| * | | 9p: remove 9p fcall debug printsEric Van Hensbergen2008-10-174-385/+0
| * | | 9p: add new protocol support codeEric Van Hensbergen2008-10-173-0/+489
| * | | 9p: encapsulate version functionEric Van Hensbergen2008-10-171-30/+44
| * | | 9p: move dirread to fs layerEric Van Hensbergen2008-10-171-103/+0
| * | | 9p: move readn meta-function from client to fs layerEric Van Hensbergen2008-10-171-26/+0
| * | | 9p: consolidate read/write functionsEric Van Hensbergen2008-10-171-122/+28
| * | | 9p: drop broken unused error path from p9_conn_create()Tejun Heo2008-10-171-16/+1
| * | | 9p: make rpc code common and rework flush codeEric Van Hensbergen2008-10-173-307/+311
| * | | 9p: use the rcall structure passed in the request in trans_fd read_workEric Van Hensbergen2008-10-171-63/+66
| * | | 9p: apply common request code to trans_fdEric Van Hensbergen2008-10-173-171/+117
| * | | 9p: apply common tagpool handling to trans_fdEric Van Hensbergen2008-10-171-34/+10
| * | | 9p: move request management to client codeEric Van Hensbergen2008-10-172-127/+161
| * | | 9p: eliminate callback complexityEric Van Hensbergen2008-10-171-83/+66
| * | | 9p: consolidate mux_rpc and request structureEric Van Hensbergen2008-10-171-46/+22
| * | | 9p: remove unnecessary prototypesEric Van Hensbergen2008-10-172-548/+495
| * | | 9p: remove duplicate client stateEric Van Hensbergen2008-10-171-15/+11
| * | | 9p: consolidate transport structureEric Van Hensbergen2008-10-174-157/+120
| * | | 9p-trans_fd: use single pollerTejun Heo2008-10-171-166/+86
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-10-2016-25/+31
|\ \ \
| * | | netfilter: replace old NF_ARP calls with NFPROTO_ARPJan Engelhardt2008-10-203-4/+4
| * | | netfilter: fix compilation error with NAT=nPablo Neira Ayuso2008-10-201-0/+2
| * | | netfilter: xt_recent: use proc_create_data()Alexey Dobriyan2008-10-201-6/+4
| * | | netfilter: snmp nat leaks memory in case of failureIlpo Järvinen2008-10-201-0/+1
| * | | netfilter: xt_iprange: fix range inversion matchAlexey Dobriyan2008-10-201-4/+4
| * | | netfilter: ctnetlink: remove obsolete NAT dependency from KconfigPatrick McHardy2008-10-201-1/+0
| * | | pkt_sched: sch_generic: Fix oops in sch_teqlJarek Poplawski2008-10-191-0/+2
| * | | dccp: Port redirection support for DCCPGerrit Renker2008-10-193-3/+4
| * | | tcp: Fix IPv6 fallout from 'Port redirection support for TCP'KOVACS Krisztian2008-10-192-3/+4
| * | | netdev: change name dropping error codesStephen Hemminger2008-10-191-3/+3
| * | | ipvs: Update CONFIG_IP_VS_IPV6 description and help textJulius Volz2008-10-191-1/+3
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2008-10-1721-47/+26
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | net: Remove CONFIG_KMOD from net/ (towards removing CONFIG_KMOD entirely)Johannes Berg2008-10-1620-46/+20
| * | ipv4: Add a missing rcu_assign_pointer() in routing cache.Eric Dumazet2008-10-161-1/+6
* | | Merge git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2008-10-167-268/+616
|\ \ \
OpenPOWER on IntegriCloud