[parisc-linux-cvs] linux-2.5 jejb

[James Bottomley]

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

Log message:
    updating branch linus to LINUS_2553
    
    Status:
    
    Vendor Tag:	linus
    Release Tags:	LINUS_2553
    
    U linux-2.5/sound/core/hwdep.c
    U linux-2.5/sound/core/memory.c
    C linux-2.5/sound/core/rawmidi.c
    C linux-2.5/sound/core/control.c
    U linux-2.5/sound/core/info_oss.c
    U linux-2.5/sound/core/wrappers.c
    C linux-2.5/sound/core/init.c
    U linux-2.5/sound/core/misc.c
    C linux-2.5/sound/core/pcm_native.c
    C linux-2.5/sound/core/pcm_lib.c
    U linux-2.5/sound/core/isadma.c
    C linux-2.5/sound/core/device.c
    U linux-2.5/sound/core/timer.c
    C linux-2.5/sound/core/sound.c
    U linux-2.5/sound/core/pcm_memory.c
    C linux-2.5/sound/core/Makefile
    U linux-2.5/sound/core/Kconfig
    U linux-2.5/sound/core/pcm_misc.c
    U linux-2.5/sound/core/rtctimer.c
    C linux-2.5/sound/core/pcm_sgbuf.c
    U linux-2.5/sound/core/sound_oss.c
    C linux-2.5/sound/core/info.c
    U linux-2.5/sound/core/pcm_timer.c
    C linux-2.5/sound/core/pcm.c
    U linux-2.5/sound/core/seq/seq_midi_event.c
    U linux-2.5/sound/core/seq/seq_prioq.c
    U linux-2.5/sound/core/seq/seq_memory.c
    U linux-2.5/sound/core/seq/seq_clientmgr.c
    C linux-2.5/sound/core/seq/seq_device.c
    U linux-2.5/sound/core/seq/seq_fifo.h
    U linux-2.5/sound/core/seq/seq_info.c
    U linux-2.5/sound/core/seq/seq_queue.h
    C linux-2.5/sound/core/seq/seq_lock.c
    U linux-2.5/sound/core/seq/seq_instr.c
    U linux-2.5/sound/core/seq/seq_fifo.c
    C linux-2.5/sound/core/seq/seq_lock.h
    U linux-2.5/sound/core/seq/seq_dummy.c
    U linux-2.5/sound/core/seq/seq_info.h
    U linux-2.5/sound/core/seq/seq_system.h
    U linux-2.5/sound/core/seq/seq_virmidi.c
    U linux-2.5/sound/core/seq/seq_system.c
    U linux-2.5/sound/core/seq/seq_ports.h
    U linux-2.5/sound/core/seq/seq_timer.h
    U linux-2.5/sound/core/seq/seq_memory.h
    U linux-2.5/sound/core/seq/seq_ports.c
    C linux-2.5/sound/core/seq/seq.c
    U linux-2.5/sound/core/seq/seq_timer.c
    U linux-2.5/sound/core/seq/seq_queue.c
    U linux-2.5/sound/core/seq/seq_clientmgr.h
    U linux-2.5/sound/core/seq/seq_midi.c
    C linux-2.5/sound/core/seq/Makefile
    U linux-2.5/sound/core/seq/seq_midi_emul.c
    U linux-2.5/sound/core/seq/seq_prioq.h
    U linux-2.5/sound/core/seq/oss/seq_oss_midi.c
    U linux-2.5/sound/core/seq/oss/seq_oss_event.h
    U linux-2.5/sound/core/seq/oss/seq_oss_synth.c
    U linux-2.5/sound/core/seq/oss/seq_oss_ioctl.c
    U linux-2.5/sound/core/seq/oss/seq_oss_init.c
    U linux-2.5/sound/core/seq/oss/seq_oss_rw.c
    U linux-2.5/sound/core/seq/oss/seq_oss_misc.c
    U linux-2.5/sound/core/seq/oss/seq_oss_event.c
    U linux-2.5/sound/core/seq/oss/seq_oss_readq.h
    U linux-2.5/sound/core/seq/oss/seq_oss_readq.c
    U linux-2.5/sound/core/seq/oss/seq_oss_timer.c
    U linux-2.5/sound/core/seq/oss/seq_oss_writeq.h
    U linux-2.5/sound/core/seq/oss/seq_oss_synth.h
    C linux-2.5/sound/core/seq/oss/Makefile
    U linux-2.5/sound/core/seq/oss/seq_oss_device.h
    U linux-2.5/sound/core/seq/oss/seq_oss_timer.h
    U linux-2.5/sound/core/seq/oss/seq_oss_midi.h
    U linux-2.5/sound/core/seq/oss/seq_oss.c
    U linux-2.5/sound/core/seq/oss/seq_oss_writeq.c
    U linux-2.5/sound/core/seq/instr/ainstr_fm.c
    U linux-2.5/sound/core/seq/instr/ainstr_iw.c
    U linux-2.5/sound/core/seq/instr/ainstr_gf1.c
    U linux-2.5/sound/core/seq/instr/ainstr_simple.c
    C linux-2.5/sound/core/seq/instr/Makefile
    C linux-2.5/sound/core/oss/Makefile
    U linux-2.5/sound/core/oss/copy.c
    U linux-2.5/sound/core/oss/pcm_plugin.c
    U linux-2.5/sound/core/oss/plugin_ops.h
    U linux-2.5/sound/core/oss/rate.c
    U linux-2.5/sound/core/oss/linear.c
    C linux-2.5/sound/core/oss/mixer_oss.c
    U linux-2.5/sound/core/oss/io.c
    U linux-2.5/sound/core/oss/pcm_plugin.h
    C linux-2.5/sound/core/oss/pcm_oss.c
    U linux-2.5/sound/core/oss/route.c
    U linux-2.5/sound/core/oss/mulaw.c
    C linux-2.5/sound/core/ioctl32/ioctl32.c
    U linux-2.5/sound/core/ioctl32/ioctl32.h
    U linux-2.5/sound/core/ioctl32/rawmidi32.c
    U linux-2.5/sound/core/ioctl32/timer32.c
    U linux-2.5/sound/core/ioctl32/pcm32.c
    C linux-2.5/sound/core/ioctl32/Makefile
    U linux-2.5/sound/core/ioctl32/hwdep32.c
    U linux-2.5/sound/core/ioctl32/seq32.c
    
    23 conflicts created by this import.
    Use the following command to help the merge:
    
    cvs checkout -jlinus:yesterday -jlinus linux-2.5/sound/core