aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* fix comment/printk typos concerning "already"Uwe Kleine-König2010-07-111-1/+1
* Merge branch 'master' into for-nextJiri Kosina2010-06-1674-398/+731
|\
| * pktgen: Fix accuracy of inter-packet delay.Daniel Turull2010-06-101-1/+1
| * pkt_sched: gen_estimator: add a new lockEric Dumazet2010-06-101-3/+12
| * net: deliver skbs on inactive slaves to exact matchesJohn Fastabend2010-06-102-5/+16
| * ipv6: fix ICMP6_MIB_OUTERRORSEric Dumazet2010-06-091-2/+2
| * Merge branch 'num_rx_queues' of git://kernel.ubuntu.com/rtg/net-2.6David S. Miller2010-06-091-5/+3
| |\
| | * net: Print num_rx_queues imbalance warning only when there are allocated queuesTim Gardner2010-06-091-5/+3
| * | caif: fix a couple range checksDan Carpenter2010-06-092-2/+2
| |/
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-06-093-10/+87
| |\
| | * mac80211: fix deauth before assocJohannes Berg2010-06-081-2/+38
| | * mac80211: fix function pointer checkHolger Schurig2010-06-071-1/+1
| | * mac80211: process station blockack action frames from workJohannes Berg2010-06-042-7/+48
| * | ipmr: dont corrupt listsEric Dumazet2010-06-072-2/+6
| * | ip6mr: fix a typo in ip6mr_for_each_table()Eric Dumazet2010-06-061-1/+1
| * | ipv6: avoid high order allocationsEric Dumazet2010-06-051-1/+4
| * | tcp: use correct net ns in cookie_v4_check()Eric Dumazet2010-06-041-1/+1
| * | rps: tcp: fix rps_sock_flow_table table updatesEric Dumazet2010-06-041-3/+4
| * | syncookies: remove Kconfig text line about disabled-by-defaultFlorian Westphal2010-06-041-5/+5
| * | net: check for refcount if pop a stacked dst_entrySteffen Klassert2010-06-041-2/+2
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-06-032-4/+15
| |\ \ | | |/
| | * mac80211: fix dialog token allocatorJohannes Berg2010-06-011-2/+4
| | * mac80211: fix blockack-req processingJohannes Berg2010-06-011-2/+11
| * | act_pedit: access skb->data safelyChangli Gao2010-06-031-10/+14
| * | cls_u32: use skb_header_pointer() to dereference data safelyChangli Gao2010-06-021-13/+36
| * | TCP: tcp_hybla: Fix integer overflow in slow start incrementDaniele Lacamera2010-06-021-2/+2
| * | act_nat: fix the wrong checksum when addr isn't in old_addr/maskChangli Gao2010-06-021-0/+4
| * | net: fix conflict between null_or_orig and null_or_bondJohn Fastabend2010-06-021-4/+4
| * | net: init_vlan should not copy slave or master flagsJohn Fastabend2010-06-021-1/+2
| * | xfrm: force a dst reference in __xfrm_route_forward()Eric Dumazet2010-06-021-0/+1
| * | net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1Joe Perches2010-05-311-2/+2
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-05-313-16/+5
| |\ \
| | * | netfilter: xtables: stackptr should be percpuEric Dumazet2010-05-313-12/+5
| | * | netfilter: don't xt_jumpstack_alloc twice in xt_register_tableXiaotian Feng2010-05-311-4/+0
| * | | net: sock_queue_err_skb() dont mess with sk_forward_allocEric Dumazet2010-05-313-10/+32
| * | | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2010-05-3119-105/+232
| |\ \ \ | | |/ /
| | * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-05-2811-27/+70
| | |\ \
| | * \ \ Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2010-05-271-6/+6
| | |\ \ \
| | | * \ \ Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...Steven Rostedt2010-05-2112-80/+215
| | | |\ \ \
| | | * \ \ \ Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...Steven Rostedt2010-05-182-6/+58
| | | |\ \ \ \
| | | * | | | | tracing: Let tracepoints have data passed to tracepoint callbacksSteven Rostedt2010-05-141-6/+6
| | * | | | | | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2010-05-271-11/+18
| | |\ \ \ \ \ \
| | | * | | | | | sunrpc: fix leak on error on socket xprt setupJ. Bruce Fields2010-05-261-11/+18
| | * | | | | | | iucv: convert cpu notifier to return encapsulate errno valueAkinobu Mita2010-05-271-4/+5
| | |/ / / / / /
| | * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2010-05-2523-199/+222
| | |\ \ \ \ \ \
| | * | | | | | | sunrpc: use formatting of module name in SUNRPCAlex Riesen2010-05-251-4/+1
| | * | | | | | | kernel-wide: replace USHORT_MAX, SHORT_MAX and SHORT_MIN with USHRT_MAX, SHRT...Alexey Dobriyan2010-05-255-8/+8
| | * | | | | | | Merge branch 'bkl/ioctl' of git://git.kernel.org/pub/scm/linux/kernel/git/fre...Linus Torvalds2010-05-242-6/+25
| | |\ \ \ \ \ \ \
| | | * | | | | | | sunrpc: Pushdown the bkl from sunrpc cache ioctlFrederic Weisbecker2010-05-221-3/+10
| | | * | | | | | | sunrpc: Pushdown the bkl from ioctlFrederic Weisbecker2010-05-221-3/+15
| | | | |_|_|/ / / | | | |/| | | | |