From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Thu, 6 Jul 2006 04:08:43 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v3.12-rc1~34776
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=075d6adf909ac8706bd0be7832e6dadb0aef314b;p=kernel%2Fkernel-generic.git

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
---

075d6adf909ac8706bd0be7832e6dadb0aef314b