Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
commit90ca9a2ff4d6b89b6939c3ece19f8fed1eecdbab
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 10 Jul 2006 22:13:53 +0000 (10 15:13 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 10 Jul 2006 22:13:53 +0000 (10 15:13 -0700)
treec671df0bd9fa1a13da69ec57e3fdda1385e59729
parent2c87e2cd0b57f63c226cd51f55ccc36867541a24
parent9faefb6d41f770e9cebad0fa180e7e78ef861211
Merge commit /linux/kernel/git/davem/net-2.6 of HEAD

* HEAD:
  [DCCP]: Fix sparse warnings.
  [TCP]: Remove TCP Compound
  [BPQ] lockdep: fix false positive
  [IPV4] inetpeer: Get rid of volatile from peer_total
  [AX.25]: Get rid of the last volatile.