summaryrefslogtreecommitdiffstats
path: root/fs/proc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-23 12:14:42 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-23 12:14:42 -0700
commit6450f65168bcf3c03b5fb44c2fe96682c0d3086b (patch)
treec6d2c3e0885ef3f73893c7e6d22ea9454d073ee6 /fs/proc
parent7a8fc9b248e77a4eab0613acf30a6811799786b3 (diff)
parentf410a1fba7afa79d2992620e874a343fdba28332 (diff)
downloadlinux-6450f65168bcf3c03b5fb44c2fe96682c0d3086b.tar.bz2
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.
Diffstat (limited to 'fs/proc')
0 files changed, 0 insertions, 0 deletions