fixed merge mistake that picked up 2.6.9 rather than 2.6.9-1.11_FC2 code
authorMarc Fiuczynski <mef@cs.princeton.edu>
Fri, 28 Jan 2005 05:16:37 +0000 (05:16 +0000)
committerMarc Fiuczynski <mef@cs.princeton.edu>
Fri, 28 Jan 2005 05:16:37 +0000 (05:16 +0000)
commit6197179c6cf949eef23890064fa3cf716693553e
treeaf937d1b7b5f847a25d0f9f079c53baff98f28aa
parent8c8ad62aef0a333ed8688a8505ede6549032bbee
fixed merge mistake that picked up 2.6.9 rather than 2.6.9-1.11_FC2 code
arch/i386/mm/init.c
fs/ncpfs/file.c
init/main.c
ipc/msg.c
net/core/dev.c
net/ipv4/devinet.c
net/netlink/af_netlink.c
net/sunrpc/svcauth_unix.c