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)
commit979ce809bab37cf438f0db22bfa732d01a84a8c2
tree406fd7f1731c51c2a2735c08d327f2f16a853ebe
parent7a2fe8c49f0f346601a18c69ba0f75227c0c5993
parent1efa3c05f8640c37ba89d54dfaa18504d21986ce
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NET] compat ifconf: fix limits