From: Linus Torvalds Date: Fri, 30 Dec 2011 01:35:33 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=50b2abed6b0812cbeda9f6dd48cc4c247be80643;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git Merge git://git./linux/kernel/git/davem/net * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: packet: fix possible dev refcnt leak when bind fail netem: dont call vfree() under spinlock and BH disabled netfilter: ctnetlink: fix scheduling while atomic if helper is autoloaded netfilter: ctnetlink: fix return value of ctnetlink_get_expect() --- 50b2abed6b0812cbeda9f6dd48cc4c247be80643