]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 32f9306 f6c5d73)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 18 May 2007 15:25:14 +0000 (08:25 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 18 May 2007 15:25:14 +0000 (08:25 -0700)
commitbfea13d4a127aab4c10085b6f9b6e2ff4f023f79
tree4195848eb43a12409511cea39903c3e4c6249281tree | snapshot
parent32f9306b161a5e0c892132f7227f36de94090289commit | diff
parentf6c5d736af6bc71cebc017e4001ec5efff1ee116commit | 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:
  [IPV4]: Remove IPVS icmp hack from route.c for now.
  [IPV4]: Correct rp_filter help text.
  [TCP]: TCP_CONG_YEAH requires TCP_CONG_VEGAS
  [TCP] slow start: Make comments and code logic clearer.
  [BLUETOOTH]: Fix locking in hci_sock_dev_event().
  [NET]: Fix BMSR_100{HALF,FULL}2 defines in linux/mii.h
  [NET]: lockdep classes in register_netdevice
Linux 2.6 source tree