[parisc-linux-cvs] linux-2.5 jejb

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


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

Log message:
    updating branch linus to LINUS_2553
    
    Status:
    
    Vendor Tag:	linus
    Release Tags:	LINUS_2553
    
    U linux-2.5/drivers/usb/core/config.c
    C linux-2.5/drivers/usb/core/inode.c
    U linux-2.5/drivers/usb/core/hub.h
    U linux-2.5/drivers/usb/core/usb.h
    U linux-2.5/drivers/usb/core/message.c
    U linux-2.5/drivers/usb/core/driverfs.c
    U linux-2.5/drivers/usb/core/hcd.h
    C linux-2.5/drivers/usb/core/hub.c
    U linux-2.5/drivers/usb/core/hcd-pci.c
    U linux-2.5/drivers/usb/core/devio.c
    C linux-2.5/drivers/usb/core/usb.c
    C linux-2.5/drivers/usb/core/hcd.c
    U linux-2.5/drivers/usb/core/urb.c
    U linux-2.5/drivers/usb/core/Kconfig
    U linux-2.5/drivers/usb/core/usb-debug.c
    U linux-2.5/drivers/usb/core/buffer.c
    U linux-2.5/drivers/usb/core/devices.c
    U linux-2.5/drivers/usb/core/file.c
    C linux-2.5/drivers/usb/core/Makefile
    
    5 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jlinus:yesterday -jlinus linux-2.5/drivers/usb/core