]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0ca2b77 6f5b7ef)
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)
commiteb193e405155c5680ca1560b040b1551566660f9
treee4613f9c3a9106c0d05fb3f048fb38068f64843atree | snapshot
parent0ca2b776ab1f4ba99d7f592baa4ff8525e53b050commit | diff
parent6f5b7ef6b5816dc497094048d7d8a270004602d6commit | diff
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
Linux 2.6 source tree