summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-06 06:08:43 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-06 06:08:43 +0200
commit075d6adf909ac8706bd0be7832e6dadb0aef314b (patch)
treef9036aeb464a2492ce69b2fbb24d36f26c1310d3 /Makefile
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parent[PKT_SCHED]: Fix error handling while dumping actions (diff)
downloadlinux-075d6adf909ac8706bd0be7832e6dadb0aef314b.tar.xz
linux-075d6adf909ac8706bd0be7832e6dadb0aef314b.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: [PKT_SCHED]: Fix error handling while dumping actions [PKT_SCHED]: Return ENOENT if action module is unavailable [PKT_SCHED]: Fix illegal memory dereferences when dumping actions
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions