From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 21 May 2011 07:13:03 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c21fd1a8c68ce3f49b00caf10337169262cfb8ad;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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

c21fd1a8c68ce3f49b00caf10337169262cfb8ad