]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 10 Jul 2006 22:13:53 +0000 (15:13 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 10 Jul 2006 22:13:53 +0000 (15:13 -0700)
* 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.


Trivial merge