]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 28 Sep 2007 22:44:44 +0000 (15:44 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 28 Sep 2007 22:44:44 +0000 (15:44 -0700)
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
  [TCP]: Fix MD5 signature handling on big-endian.
  [NET]: Zero length write() on socket should not simply return 0.


Trivial merge