diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-08 18:43:44 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-08 18:43:44 -0400 |
| commit | bcbc713470283bc82d043fd23b02e41a9eb8dee5 (patch) | |
| tree | 2cd88a1b83dad55dc9e489f151114c0717015ac5 /arch/arm/mach-orion5x/common.c | |
| parent | b364e2f5262e972e731a576dfc6ede0689a6c19e (diff) | |
| parent | 8d4698f7a54a492a1b96c505b30fe750ae3e61d5 (diff) | |
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 'arch/arm/mach-orion5x/common.c')
0 files changed, 0 insertions, 0 deletions