]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit046b0bfba4d42bf80a99d04eb1739b7581e0d5b1
tree1199d129cb94b128eb6029d5fcc3ff0d4900b067
parentd8f61944f169f860c32d0e89b83cf35169e7b245
parente3f4d0ad66127ff3a0306c5691c8bff787de588c
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