Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Apr 2006 00:44:47 +0000 (17:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Apr 2006 00:44:47 +0000 (17:44 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [IPV4]: ip_route_input panic fix


Trivial merge