- merge revision 1.6
authorMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:43:12 +0000 (20:43 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Thu, 27 Jan 2005 20:43:12 +0000 (20:43 +0000)
commit8e81ac31830f1bc045a2db729bc6f1c010cc4227
tree7f5a1b4403b769ef96e74bac10ddafb6e53dae39
parent5584d6eae236f4100d7d87f02193b7fe36800303
- merge revision 1.6
date: 2005/01/19 22:42:27;  author: mef;  state: Exp;  lines: +4 -0
Fixes CAN-2004 security reports 1016, 1017, and 1068
include/linux/socket.h