tree 1199d129cb94b128eb6029d5fcc3ff0d4900b067
parent 29cf7a30f8a0ce4af2406d93d5a332099be26923
parent 186c6bbced722cfeff041d2a1264c95f5d042050
author Linus Torvalds <torvalds@linux-foundation.org> 1317942910 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317942910 -0700

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