| commit | 6450f65168bcf3c03b5fb44c2fe96682c0d3086b | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 23 12:14:42 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 23 12:14:42 2008 -0700 |
| tree | c6d2c3e0885ef3f73893c7e6d22ea9454d073ee6 | |
| parent | 7a8fc9b248e77a4eab0613acf30a6811799786b3 [diff] | |
| parent | f410a1fba7afa79d2992620e874a343fdba28332 [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: ipv6: protocol for address routes icmp: icmp_sk() should not use smp_processor_id() in preemptible code pkt_sched: Fix qdisc list locking pkt_sched: Fix qdisc_watchdog() vs. dev_deactivate() race sctp: fix potential panics in the SCTP-AUTH API.