Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 May 2011 07:13:03 +0000 (00:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 May 2011 07:13:03 +0000 (00:13 -0700)
commitc21fd1a8c68ce3f49b00caf10337169262cfb8ad
tree37bb9c0511ece948cc3913f4df21166768379f5e
parent1a4022f88d40e1255920b017556092ab926d7f66
parent5d414521663295ce25c90164f4d41a07ac846468
Merge git://git./linux/kernel/git/davem/net-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  sctp: Fix build failure.
  garp: use kfree_rcu()
  ipv6: copy prefsrc setting when copying route entry