aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-06 00:08:43 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-06 00:08:43 -0400
commit075d6adf909ac8706bd0be7832e6dadb0aef314b (patch)
treef9036aeb464a2492ce69b2fbb24d36f26c1310d3 /Makefile
parente2a305ecb5734f24d3a4496605a6fdf27ddf7108 (diff)
parent4fe683f50d3fc8e36d4749277631dfc711393aa0 (diff)
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