summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds...David S. Miller2009-06-1515-36/+60
|\
| * Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2009-06-144-5/+5
| |\
| | * trivial: Fix a typo in comment of addrconf_dad_start()Masatake YAMATO2009-06-121-1/+1
| | * trivial: Kconfig: .ko is normally not included in module namesPavel Machek2009-06-122-3/+3
| | * trivial: Fix paramater/parameter typo in dmesg and source commentsMartin Olsson2009-06-121-1/+1
| * | virtio: find_vqs/del_vqs virtio operationsMichael S. Tsirkin2009-06-121-3/+3
| * | virtio: add names to virtqueue struct, mapping from devices to queues.Rusty Russell2009-06-121-1/+1
| |/
| * Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2009-06-103-4/+4
| |\
| | * Merge commit 'v2.6.30-rc6' into tracing/coreIngo Molnar2009-05-1822-100/+138
| | |\
| | * \ Merge branch 'linus' into tracing/coreIngo Molnar2009-05-0761-596/+662
| | |\ \
| | * | | 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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-06-091-0/+3
| |\ \ \ \
| | * | | | cls_cgroup: Fix oops when user send improperly 'tc filter add' requestMinoru Usui2009-06-091-0/+3
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-06-022-12/+17
| |\ \ \ \ \ | | |/ / / /
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2009-06-015-12/+40
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2009-05-293-18/+39
| |\ \ \ \ \ \
| | * | | | | | svcrdma: dma unmap the correct length for the RPCRDMA header page.Steve Wise2009-05-272-11/+11
| | * | | | | | nfsd: Revert "svcrpc: take advantage of tcp autotuning"J. Bruce Fields2009-05-271-7/+28
| * | | | | | | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2009-05-261-1/+2
| |\ \ \ \ \ \ \
| | * | | | | | | XPRTRDMA: fix client rpcrdma FRMR registration on mlx4 devicesVu Pham2009-05-261-1/+2
| | |/ / / / / /
* | | | | | | | pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2USJarek Poplawski2009-06-152-4/+4
* | | | | | | | ipv4: Fix fib_trie rebalancingJarek Poplawski2009-06-151-10/+37
* | | | | | | | Bluetooth: Fix Kconfig issue with RFKILL integrationMarcel Holtmann2009-06-141-1/+2
* | | | | | | | PIM-SM: namespace changesTom Goff2009-06-142-20/+29
* | | | | | | | ipv4: update ARPD help textTimo Teräs2009-06-131-22/+13
* | | | | | | | net: use a deferred timer in rt_check_expireEric Dumazet2009-06-131-3/+8
* | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2009-06-136-147/+298
|\ \ \ \ \ \ \ \
| * | | | | | | | x_tables: Convert printk to pr_errJoe Perches2009-06-131-8/+8
| * | | | | | | | netfilter: conntrack: optional reliable conntrack event deliveryPablo Neira Ayuso2009-06-133-18/+118
| * | | | | | | | netfilter: conntrack: move helper destruction to nf_ct_helper_destroy()Pablo Neira Ayuso2009-06-132-10/+15
| * | | | | | | | netfilter: conntrack: move event caching to conntrack extension infrastructurePablo Neira Ayuso2009-06-133-99/+150
| * | | | | | | | netfilter: nf_conntrack: use mod_timer_pending() for conntrack refreshPatrick McHardy2009-06-131-11/+6
| * | | | | | | | netfilter: nf_log: fix sleeping function called from invalid contextPatrick McHardy2009-06-131-3/+3
* | | | | | | | | net: use symbolic values for ndo_start_xmit() return codesPatrick McHardy2009-06-133-3/+3
* | | | | | | | | net: fix network drivers ndo_start_xmit() return values (part 7)Patrick McHardy2009-06-131-1/+2
* | | | | | | | | bridge: Simplify interface for ATM LANEMichał Mirosław2009-06-115-58/+44
* | | | | | | | | [PATCH] net core: Some interface flags not returned by SIOCGIFFLAGSJohn Dykstra2009-06-111-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2009-06-1125-581/+1189
|\ \ \ \ \ \ \ \
| * | | | | | | | netfilter: ip_tables: fix build errorPatrick McHardy2009-06-121-1/+1
| * | | | | | | | netfilter: nf_ct_tcp: fix up build after mergePatrick McHardy2009-06-111-1/+1
| * | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/...Patrick McHardy2009-06-11171-2846/+5357
| |\ \ \ \ \ \ \ \
| * | | | | | | | | netfilter: nf_conntrack: use per-conntrack locks for protocol dataPatrick McHardy2009-06-106-53/+45
| * | | | | | | | | netfilter: xt_socket: added new revision of the 'socket' match supporting flagsLaszlo Attila Toth2009-06-091-11/+52
| * | | | | | | | | netfilter: passive OS fingerprint xtables matchEvgeniy Polyakov2009-06-083-0/+442
| * | | | | | | | | netfilter: nf_ct_icmp: keep the ICMP ct entries longerJan Kasprzak2009-06-082-24/+8
| * | | | | | | | | netfilter: ipt_MASQUERADE: remove redundant rwlockFlorian Westphal2009-06-051-11/+1
| * | | | | | | | | netfilter: xt_NFQUEUE: queue balancing supportFlorian Westphal2009-06-051-0/+93
| * | | | | | | | | netfilter: xt_NFQUEUE: use NFPROTO_UNSPECFlorian Westphal2009-06-051-15/+1
| * | | | | | | | | netfilter: x_tables: added hook number into match extension parameter structure.Evgeniy Polyakov2009-06-043-3/+3
OpenPOWER on IntegriCloud