Menu
▾
▴
CVS Update: 2.6 (branch: trunk)
|
From: Roman Z. <zi...@us...> - 2005-07-30 23:07:26
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/oss/
Changes by: zi...@sc....(none) 05/07/30 16:07:20
Log message:
conflict fixes from import of 2.6.11
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
Makefile entry.S misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
init.c pgtable.c
2.6/drivers/block/:
amiflop.c
2.6/include/asm-ppc/:
io.h pgtable.h
Removed files:
2.6/Documentation/:
README.moxa mkdev.cciss
2.6/Documentation/filesystems/:
umsdos.txt
2.6/Documentation/i2c/:
i2c-old-porting
2.6/Documentation/scsi/:
ChangeLog
2.6/Documentation/usb/:
silverlink.txt
2.6/arch/arm26/boot/compressed/:
ofw-shark.c
2.6/arch/arm26/kernel/:
time-acorn.c
2.6/arch/arm26/lib/:
io-readsl-armv3.S io-readsw-armv3.S io-writesw-armv3.S
2.6/arch/arm26/machine/:
head.S oldlatches.c small_page.c
2.6/arch/arm26/mm/:
mm-memc.c
2.6/arch/ia64/dig/:
topology.c
2.6/arch/ia64/sn/include/:
shub.h shubio.h
2.6/arch/m68k/apollo/:
dn_debug.c
2.6/arch/m68k/sun3x/:
sun3x_ksyms.c
2.6/arch/mips/kernel/:
irix5sys.h reg.c
2.6/arch/mips/mm/:
tlb64-glue-r4k.S tlb64-glue-sb1.S tlbex32-mips32.S
tlbex32-r3k.S tlbex32-r4k.S
2.6/arch/ppc/:
defconfig
2.6/arch/ppc/boot/simple/:
gt64260_tty.c
2.6/arch/ppc/oprofile/:
init.c
2.6/arch/ppc/platforms/:
ev64260_setup.c
2.6/arch/ppc/platforms/85xx/:
mpc8540.c mpc8555.c mpc8560.c
2.6/arch/ppc/syslib/:
gt64260_common.c
2.6/arch/ppc64/kernel/:
pci_dma_direct.c
2.6/arch/ppc64/xmon/:
setjmp.c
2.6/arch/s390/kernel/:
compat_exec.c
2.6/arch/um/:
Kconfig_block
2.6/arch/um/include/:
frame.h frame_user.h umn.h
2.6/arch/um/include/sysdep-i386/:
frame.h frame_kern.h frame_user.h
2.6/arch/um/kernel/:
frame.c frame_kern.c
2.6/arch/um/kernel/skas/include/:
ptrace-skas.h
2.6/arch/um/kernel/skas/sys-i386/:
Makefile sigcontext.c
2.6/arch/um/kernel/skas/util/:
mk_ptregs.c
2.6/arch/um/kernel/tt/include/:
ptrace-tt.h
2.6/arch/um/kernel/tt/sys-i386/:
Makefile sigcontext.c
2.6/arch/x86_64/kernel/:
warmreboot.S
2.6/arch/x86_64/lib/:
old-checksum.c
2.6/drivers/acpi/:
processor.c
2.6/drivers/atm/:
nicstarmac.h
2.6/drivers/char/:
README.cycladesZ rsf16fmi.h serial_tx3912.c
serial_tx3912.h sonypi.h
2.6/drivers/char/drm/:
ati_pcigart.h drm_agpsupport.h drm_auth.h drm_bufs.h
drm_context.h drm_dma.h drm_drawable.h drm_drv.h
drm_fops.h drm_init.h drm_ioctl.h drm_irq.h drm_lock.h
drm_proc.h drm_scatter.h drm_stub.h drm_vm.h ffb.h
gamma.h i810.h i830.h i915.h mga.h r128.h radeon.h sis.h
tdfx.h
2.6/drivers/char/ip2/:
Makefile ip2mkdev.c ip2stat.c ip2trace.c
2.6/drivers/char/rio/:
cdproto.h
2.6/drivers/ide/pci/:
adma100.c adma100.h aec62xx.h cmd64x.h cy82c693.h
generic.h hpt366.h it8172.h opti621.h pdc202xx_new.h
pdc202xx_old.h piix.h serverworks.h
2.6/drivers/media/dvb/dibusb/:
dvb-dibusb.c
2.6/drivers/mtd/devices/:
doc1000.c
2.6/drivers/net/:
net_init.c
2.6/drivers/pcmcia/:
bulkmem.c
2.6/drivers/scsi/:
fd_mcs.h lasi700.h scsi_syms.c
2.6/drivers/scsi/dpt/:
dpt_osdutil.h
2.6/drivers/scsi/qla2xxx/:
ql6322.c ql6322_fw.c
2.6/drivers/usb/misc/:
tiglusb.c tiglusb.h
2.6/fs/fat/:
fatfs_syms.c
2.6/fs/jfs/:
jfs_defragfs.h
2.6/fs/smbfs/:
ChangeLog
2.6/fs/umsdos/:
Makefile README-WIP.txt dir.c emd.c inode.c ioctl.c
mangle.c namei.c rdir.c specs
2.6/include/asm-arm26/:
calls.h ian_char.h
2.6/include/asm-ia64/sn/:
router.h
2.6/include/asm-m68k/:
adb_mouse.h atari_SCCserial.h
2.6/include/asm-m68knommu/:
keyboard.h nap.h
2.6/include/asm-mips/:
ng1.h ng1hw.h
2.6/include/asm-mips/it8172/:
it8172_lpc.h
2.6/include/asm-parisc/:
bootdata.h
2.6/include/asm-ppc64/iSeries/:
ItLpPaca.h iSeries_VpdInfo.h
2.6/include/linux/:
affs_fs_i.h affs_fs_sb.h blk.h msdos_fs_i.h msdos_fs_sb.h
umsdos_fs.h umsdos_fs.p umsdos_fs_i.h
2.6/include/linux/netfilter_ipv4/:
compat_firewall.h ipchains_core.h ipfwadm_core.h
2.6/include/sound/:
soundmem.h
2.6/net/ipv4/netfilter/:
ip_fw_compat.c ip_fw_compat.h ip_fw_compat_masq.c
ip_fw_compat_redir.c ipchains_core.c ipfwadm_core.c
2.6/net/sunrpc/:
svcauth_des.c
2.6/net/sunrpc/auth_gss/:
gss_pseudoflavors.c sunrpcgss_syms.c
2.6/net/xfrm/:
xfrm_export.c
2.6/scripts/:
README.Menuconfig
2.6/sound/core/seq/oss/:
seq_oss_misc.c
2.6/sound/oss/:
cs4232.h
Revision Changes Path
1.14 +20 -12 2.6/Makefile
1.6 +4 -1 2.6/arch/ppc/Makefile
1.11 +79 -15 2.6/arch/ppc/configs/apus_defconfig
1.9 +2 -1 2.6/arch/ppc/kernel/Makefile
1.8 +18 -24 2.6/arch/ppc/kernel/entry.S
1.11 +1 -1 2.6/arch/ppc/kernel/misc.S
1.11 +1 -0 2.6/arch/ppc/kernel/ppc_ksyms.c
1.10 +1 -1 2.6/arch/ppc/kernel/setup.c
1.7 +2 -8 2.6/arch/ppc/kernel/time.c
1.7 +1 -1 2.6/arch/ppc/mm/init.c
1.10 +6 -6 2.6/arch/ppc/mm/pgtable.c
1.5 +1 -1 2.6/drivers/block/amiflop.c
1.11 +30 -11 2.6/include/asm-ppc/io.h
1.8 +20 -3 2.6/include/asm-ppc/pgtable.h
|
