projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e2a305e 4fe683f)
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)
* 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


Trivial merge
John Crispins staging tree