Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 6 Jul 2006 04:08:43 +0000 (21:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 6 Jul 2006 04:08:43 +0000 (21:08 -0700)
commit075d6adf909ac8706bd0be7832e6dadb0aef314b
treef9036aeb464a2492ce69b2fbb24d36f26c1310d3
parente2a305ecb5734f24d3a4496605a6fdf27ddf7108
parent4fe683f50d3fc8e36d4749277631dfc711393aa0
Merge /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