tree f9036aeb464a2492ce69b2fbb24d36f26c1310d3
parent e2a305ecb5734f24d3a4496605a6fdf27ddf7108
parent 4fe683f50d3fc8e36d4749277631dfc711393aa0
author Linus Torvalds <torvalds@g5.osdl.org> 1152158923 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1152158923 -0700

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