Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 25 Apr 2007 20:51:21 +0000 (13:51 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Wed, 25 Apr 2007 20:51:21 +0000 (13:51 -0700)
commit707abb7986293b24b83dba163ffc79d8895236f9
treee5f9d226ef9d864a11cfcc1df1fcd33ea0447523
parentcbc31a475a7f7748bd0a4e536533868e7cff8645
parent1194ed0a3eb8076c8fbfe310f1ccbf229e8647de
Merge /pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETLINK]: Infinite recursion in netlink.