From: Linus Torvalds 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.karo-electronics.de/?a=commitdiff_plain;h=c21fd1a8c68ce3f49b00caf10337169262cfb8ad;p=linux-beck.git Merge git://git.kernel.org/pub/scm/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