From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 6 Oct 2011 23:15:10 +0000 (-0700)
Subject: Merge git://github.com/davem330/net
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3ee72ca99288f1de95ec9c570e43f531c8799f06;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge git://github.com/davem330/net

* git://github.com/davem330/net:
  net: fix typos in Documentation/networking/scaling.txt
  bridge: leave carrier on for empty bridge
  netfilter: Use proper rwlock init function
  tcp: properly update lost_cnt_hint during shifting
  tcp: properly handle md5sig_pool references
  macvlan/macvtap: Fix unicast between macvtap interfaces in bridge mode
---

3ee72ca99288f1de95ec9c570e43f531c8799f06