linux bame

[Paul Bame]

CVSROOT:	/home/cvs/parisc
Module name:	linux
Changes by:	bame	00/11/10 10:49:15

Log message:
    cvs import ignored directory 'core', need -I next time
    
    Status:
    
    Vendor Tag:	linus
    Release Tags:	LINUS_240_TEST6
    
    C linux/net/core/Makefile
    U linux/net/core/datagram.c
    C linux/net/core/dev.c
    U linux/net/core/skbuff.c
    C linux/net/core/sock.c
    C linux/net/core/dev_mcast.c
    U linux/net/core/iovec.c
    U linux/net/core/netfilter.c
    C linux/net/core/sysctl_net_core.c
    U linux/net/core/dst.c
    C linux/net/core/neighbour.c
    U linux/net/core/scm.c
    U linux/net/core/rtnetlink.c
    U linux/net/core/filter.c
    U linux/net/core/profile.c
    U linux/net/core/utils.c
    
    6 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jlinus:yesterday -jlinus linux/net/core