Menu
▾
▴
CVS Update: 2.6 (branch: trunk)
|
From: Roman Z. <zi...@us...> - 2005-07-31 01:18:46
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/oss/
Changes by: zi...@sc....(none) 05/07/30 18:18:40
Log message:
conflict fixes from import of 2.6.12
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
Makefile entry.S head.S misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
init.c pgtable.c
2.6/include/asm-ppc/:
io.h machdep.h pgtable.h
Added files:
2.6/arch/ppc64/kernel/:
pmc.c
2.6/arch/um/kernel/:
vmlinux.lds.S
2.6/include/asm-ppc64/:
pmc.h
Removed files:
2.6/Documentation/BK-usage/:
00-INDEX bk-kernel-howto.txt bk-make-sum bksend bz64wrap
cpcset cset-to-linus csets-to-patches gcapatch unbz64wrap
2.6/Documentation/DocBook/:
tulip-user.tmpl via-audio.tmpl
2.6/Documentation/cdrom/:
mcd
2.6/Documentation/i2c/:
i2c-parport
2.6/Documentation/networking/:
ethertap.txt
2.6/Documentation/scsi/:
qla2xxx.revision.notes
2.6/arch/arm/configs/:
a5k_defconfig
2.6/arch/arm/mach-ixp4xx/:
prpmc1100-pci.c prpmc1100-setup.c
2.6/arch/arm/mm/:
copypage-v4mc.S copypage-xscale.S minicache.c
2.6/arch/ia64/sn/include/pci/:
pcibus_provider_defs.h pcidev.h
2.6/arch/m68knommu/platform/5206/ARNEWSH/:
crt0_ram.S
2.6/arch/m68knommu/platform/5206e/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5206e/eLITE/:
crt0_ram.S
2.6/arch/m68knommu/platform/5249/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5272/CANCam/:
crt0_ram.S
2.6/arch/m68knommu/platform/5272/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5272/NETtel/:
crt0_ram.S
2.6/arch/m68knommu/platform/5272/SCALES/:
crt0_ram.S
2.6/arch/m68knommu/platform/5272/senTec/:
crt0_ram.S
2.6/arch/m68knommu/platform/527x/M5271EVB/:
crt0_ram.S
2.6/arch/m68knommu/platform/527x/M5275EVB/:
crt0_ram.S
2.6/arch/m68knommu/platform/528x/M5282EVB/:
crt0_ram.S
2.6/arch/m68knommu/platform/528x/senTec/:
crt0_ram.S
2.6/arch/m68knommu/platform/5307/ARNEWSH/:
crt0_ram.S
2.6/arch/m68knommu/platform/5307/CLEOPATRA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5307/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5307/MP3/:
crt0_ram.S
2.6/arch/m68knommu/platform/5307/NETtel/:
crt0_ram.S
2.6/arch/m68knommu/platform/5407/CLEOPATRA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5407/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/68328/pilot/:
crt0_rom.S
2.6/arch/m68knommu/platform/68360/uCquicc/:
crt0_ram.S crt0_rom.S
2.6/arch/m68knommu/platform/68EZ328/ucsimm/:
crt0_fixed.S crt0_himem.S crt0_ram.S crt0_rom.S
2.6/arch/m68knommu/platform/68VZ328/de2/:
Makefile crt0_ram.S
2.6/arch/m68knommu/platform/68VZ328/ucdimm/:
Makefile crt0_fixed.S crt0_himem.S crt0_ram.S crt0_rom.S
2.6/arch/mips/vr41xx/common/:
ksyms.c rtc.c serial.c vrc4171.c
2.6/arch/mips/vr41xx/tanbac-tb0229/:
tb0219.c
2.6/arch/parisc/configs/:
n4000_defconfig
2.6/arch/ppc/boot/simple/:
misc-chestnut.S misc-ev64260.S misc-mv64x60.S
mv64x60_stub.c
2.6/arch/ppc/kernel/:
head_e500.S
2.6/arch/ppc/platforms/85xx/:
mpc85xx_devices.c mpc85xx_sys.c
2.6/arch/ppc/syslib/:
m8260_pci.c m8260_pci.h ppc4xx_serial.c
2.6/arch/ppc64/boot/:
no_initrd.c start.c
2.6/arch/sh/:
defconfig
2.6/arch/sh64/:
defconfig
2.6/arch/sh64/lib/:
old-checksum.c
2.6/arch/sparc64/lib/:
VIS.h VISbzero.S VIScsum.S VIScsumcopy.S VIScsumcopyusr.S
VISmemset.S rwsem.c
2.6/arch/um/drivers/:
slip_proto.h
2.6/arch/um/include/:
2_5compat.h
2.6/arch/um/kernel/:
checksum.c initrd_kern.c initrd_user.c sys_call_table.c
2.6/arch/um/sys-i386/util/:
mk_thread_kern.c mk_thread_user.c
2.6/arch/um/sys-x86_64/util/:
mk_thread_kern.c mk_thread_user.c
2.6/arch/um/util/:
mk_constants_kern.c mk_constants_user.c mk_task_kern.c
mk_task_user.c
2.6/arch/x86_64/kernel/:
vsyscall.S
2.6/drivers/base/:
interface.c
2.6/drivers/block/paride/:
setup.h
2.6/drivers/cdrom/:
mcd.c mcd.h
2.6/drivers/char/:
console_macros.h digi_bios.h digi_fep.h fep.h
hp600_keyb.c pcxx.c pcxx.h tpqic02.c
2.6/drivers/char/agp/:
intel-mch-agp.c
2.6/drivers/cpufreq/:
proc_intf.c
2.6/drivers/ide/:
ide-default.c
2.6/drivers/isdn/tpam/:
Kconfig Makefile tpam.h tpam_commands.c tpam_crcpc.c
tpam_hdlc.c tpam_main.c tpam_memory.c tpam_nco.c
tpam_queues.c
2.6/drivers/media/dvb/b2c2/:
b2c2-common.c b2c2-usb-core.c
2.6/drivers/media/dvb/bt8xx/:
dst.h
2.6/drivers/media/dvb/dibusb/:
dvb-dibusb-pid.c
2.6/drivers/media/video/:
tuner.c
2.6/drivers/mtd/maps/:
chestnut.c ich2rom.c
2.6/drivers/net/:
bagetlance.c ethertap.c
2.6/drivers/net/fc/:
Makefile iph5526.c iph5526_ip.h iph5526_novram.c
iph5526_scsi.h tach.h tach_structs.h
2.6/drivers/scsi/:
qlogicfc.h qlogicisp.h scsi_obsolete.h
2.6/drivers/scsi/qla2xxx/:
qla_listops.h
2.6/drivers/scsi/sym53c8xx_2/:
sym_conf.h sym_misc.c
2.6/drivers/usb/image/:
hpusbscsi.c hpusbscsi.h
2.6/drivers/video/intelfb/:
intelfbdrv.h
2.6/drivers/video/savage/:
savagefb.c
2.6/include/asm-arm/arch-omap/:
clocks.h
2.6/include/asm-ia64/:
ioctl32.h
2.6/include/asm-ia64/sn/:
fetchop.h sn_fru.h sndrv.h
2.6/include/asm-m68knommu/:
io_hw_swap.h semp3.h
2.6/include/asm-mips/vr41xx/:
vrc4171.h
2.6/include/asm-parisc/:
parport_gsc.h
2.6/include/asm-ppc64/iSeries/:
iSeries_fixup.h
2.6/include/asm-um/:
arch-signal-i386.h elf.h
2.6/include/asm-x86_64/:
ioctl32.h ipc.h
2.6/include/linux/:
compiler-gcc+.h dp83840.h iso_fs_i.h iso_fs_sb.h
tpqic02.h
2.6/include/sound/:
yss225.h
2.6/net/ipv4/ipvs/:
ip_vs_proto_icmp.c
2.6/net/ipv6/:
README
2.6/net/netlink/:
netlink_dev.c
2.6/scripts/:
makeman split-man
2.6/sound/core/ioctl32/:
Makefile hwdep32.c ioctl32.c ioctl32.h pcm32.c
rawmidi32.c seq32.c timer32.c
2.6/sound/isa/gus/:
gus_lfo.c
2.6/sound/oss/:
maestro_tables.h
Revision Changes Path
1.15 +39 -20 2.6/Makefile
1.7 +17 -17 2.6/arch/ppc/Makefile
1.12 +736 -312 2.6/arch/ppc/configs/apus_defconfig
1.10 +3 -1 2.6/arch/ppc/kernel/Makefile
1.9 +105 -97 2.6/arch/ppc/kernel/entry.S
1.10 +113 -276 2.6/arch/ppc/kernel/head.S
1.12 +13 -22 2.6/arch/ppc/kernel/misc.S
1.12 +2 -1 2.6/arch/ppc/kernel/ppc_ksyms.c
1.11 +37 -22 2.6/arch/ppc/kernel/setup.c
1.8 +0 -3 2.6/arch/ppc/kernel/time.c
1.8 +25 -12 2.6/arch/ppc/mm/init.c
1.11 +7 -17 2.6/arch/ppc/mm/pgtable.c
1.12 +13 -0 2.6/include/asm-ppc/io.h
1.8 +9 -0 2.6/include/asm-ppc/machdep.h
1.9 +116 -58 2.6/include/asm-ppc/pgtable.h
|
