]> err.no Git - linux-2.6/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 9 Mar 2006 01:50:14 +0000 (17:50 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 9 Mar 2006 01:50:14 +0000 (17:50 -0800)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET] compat ifconf: fix limits


Trivial merge