Merge git://github.com/davem330/net
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Oct 2011 23:15:10 +0000 (16:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Oct 2011 23:15:10 +0000 (16:15 -0700)
* 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


Trivial merge