]> git.baikalelectronics.ru Git - kernel.git/commit
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Nov 2006 16:50:46 +0000 (08:50 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 2 Nov 2006 16:50:46 +0000 (08:50 -0800)
commite2611fd58b30306f08a3684607b700df053b2635
treee4613f9c3a9106c0d05fb3f048fb38068f64843a
parentd35e8dfca9b2bf97bdbba5ce1ba720a6b0e3f074
parent0d083a868878a68199ea58710a665b0edacb494d
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [NETFILTER]: silence a warning in ebtables
  [IPV6]: File the fingerprints off ah6->spi/esp6->spi
  [TCP]: Set default congestion control when no sysctl.
  [TIPC] net/tipc/port.c: fix NULL dereference