summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds2008-09-09 00:43:44 +0200
committerLinus Torvalds2008-09-09 00:43:44 +0200
commitbcbc713470283bc82d043fd23b02e41a9eb8dee5 (patch)
tree2cd88a1b83dad55dc9e489f151114c0717015ac5 /MAINTAINERS
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parentbridge: don't allow setting hello time to zero (diff)
downloadkernel-qcow2-linux-bcbc713470283bc82d043fd23b02e41a9eb8dee5.tar.gz
kernel-qcow2-linux-bcbc713470283bc82d043fd23b02e41a9eb8dee5.tar.xz
kernel-qcow2-linux-bcbc713470283bc82d043fd23b02e41a9eb8dee5.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: bridge: don't allow setting hello time to zero netns : fix kernel panic in timewait socket destruction pkt_sched: Fix qdisc state in net_tx_action() netfilter: nf_conntrack_irc: make sure string is terminated before calling simple_strtoul netfilter: nf_conntrack_gre: nf_ct_gre_keymap_flush() fixlet netfilter: nf_conntrack_gre: more locking around keymap list netfilter: nf_conntrack_sip: de-static helper pointers
Diffstat (limited to 'MAINTAINERS')
0 files changed, 0 insertions, 0 deletions