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)
* 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


Trivial merge