[parisc-linux-cvs] linux-2.5 jejb

James Bottomley parisc-linux@lists.parisc-linux.org
Tue, 24 Dec 2002 16:18:13 -0700 (MST)

CVSROOT:	/var/cvs
Module name:	linux-2.5
Changes by:	jejb	02/12/24 16:18:13

Log message:
    updating branch linus to LINUS_2553
    Vendor Tag:	linus
    Release Tags:	LINUS_2553
    U linux-2.5/net/core/link_watch.c
    U linux-2.5/net/core/utils.c
    U linux-2.5/net/core/neighbour.c
    U linux-2.5/net/core/filter.c
    U linux-2.5/net/core/dev_mcast.c
    U linux-2.5/net/core/sysctl_net_core.c
    U linux-2.5/net/core/scm.c
    U linux-2.5/net/core/dv.c
    C linux-2.5/net/core/netfilter.c
    U linux-2.5/net/core/dev.c
    U linux-2.5/net/core/dst.c
    U linux-2.5/net/core/datagram.c
    C linux-2.5/net/core/pktgen.c
    U linux-2.5/net/core/skbuff.c
    U linux-2.5/net/core/sock.c
    U linux-2.5/net/core/wireless.c
    C linux-2.5/net/core/Makefile
    U linux-2.5/net/core/profile.c
    U linux-2.5/net/core/iovec.c
    U linux-2.5/net/core/rtnetlink.c
    3 conflicts created by this import.
    Use the following command to help the merge:
    cvs checkout -jlinus:yesterday -jlinus linux-2.5/net/core