Menu
▾
▴
CVS Update: 2.6 (branch: trunk)
|
From: Roman Z. <zi...@us...> - 2005-11-12 19:51:39
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/oss/
Changes by: zi...@sc....(none) 05/11/12 11:51:30
Log message:
conflict fixes from import of 2.6.14
Modified files:
./:
Makefile
2.6/arch/ppc/:
Kconfig Makefile
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
head.S misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
init.c
2.6/include/asm-ppc/:
io.h pgtable.h
Added files:
2.6/drivers/net/:
sis190.c
2.6/include/asm-arm/arch-omap/:
serial.h
2.6/include/linux/netfilter_ipv6/:
ip6t_REJECT.h
Removed files:
2.6/arch/arm26/boot/compressed/:
hw-bse.c
2.6/arch/i386/lib/:
dec_and_lock.c
2.6/arch/ia64/kernel/:
domain.c
2.6/arch/ia64/lib/:
dec_and_lock.c
2.6/arch/m68k/lib/:
memcmp.c memcpy.c memset.c
2.6/arch/m68knommu/platform/68VZ328/de2/:
config.c
2.6/arch/m68knommu/platform/68VZ328/ucdimm/:
config.c
2.6/arch/mips/configs/:
osprey_defconfig
2.6/arch/mips/kernel/:
offset.c
2.6/arch/mips/lib/:
dec_and_lock.c
2.6/arch/mips/vr4181/common/:
Makefile int_handler.S irq.c serial.c time.c
2.6/arch/mips/vr4181/osprey/:
Makefile dbg_io.c prom.c reset.c setup.c
2.6/arch/mips/vr41xx/tanbac-tb0226/:
Makefile setup.c
2.6/arch/mips/vr41xx/tanbac-tb0229/:
Makefile setup.c
2.6/arch/mips/vr41xx/victor-mpc30x/:
Makefile setup.c
2.6/arch/mips/vr41xx/zao-capcella/:
Makefile setup.c
2.6/arch/parisc/lib/:
debuglocks.c
2.6/arch/ppc/boot/utils/:
addRamDisk.c
2.6/arch/ppc/configs/:
SM850_defconfig SPD823TS_defconfig adir_defconfig
ash_defconfig beech_defconfig cedar_defconfig
k2_defconfig mcpn765_defconfig menf1_defconfig
oak_defconfig pcore_defconfig rainier_defconfig
redwood_defconfig
2.6/arch/ppc/kernel/:
find_name.c
2.6/arch/ppc/lib/:
dec_and_lock.c
2.6/arch/ppc/platforms/:
adir.h adir_pci.c adir_pic.c adir_setup.c k2.c k2.h
mcpn765.c mcpn765.h pcore.c pcore.h spd8xx.h
2.6/arch/ppc/platforms/4xx/:
ash.c ash.h oak.c oak.h oak_setup.h
2.6/arch/ppc64/boot/:
ppc32-types.h
2.6/arch/ppc64/lib/:
dec_and_lock.c
2.6/arch/ppc64/oprofile/:
op_impl.h
2.6/arch/sparc/lib/:
debuglocks.c
2.6/arch/sparc64/lib/:
debuglocks.c dec_and_lock.S
2.6/arch/sparc64/mm/:
extable.c
2.6/arch/sparc64/prom/:
map.S memory.c
2.6/arch/um/:
Kconfig_char Kconfig_i386 Kconfig_net Kconfig_scsi
Kconfig_x86_64
2.6/arch/um/include/:
syscall_user.h
2.6/arch/um/kernel/:
mem_user.c process.c syscall_user.c tempfile.c
2.6/arch/um/kernel/skas/:
syscall_kern.c syscall_user.c
2.6/arch/um/kernel/skas/util/:
Makefile mk_ptregs-i386.c mk_ptregs-x86_64.c
2.6/arch/um/os-Linux/util/:
Makefile mk_user_constants.c
2.6/arch/um/sys-i386/util/:
Makefile mk_sc.c mk_thread.c
2.6/arch/um/sys-x86_64/util/:
Makefile mk_sc.c mk_thread.c
2.6/arch/um/util/:
Makefile mk_constants.c mk_task.c
2.6/arch/v850/kernel/:
asm-consts.c
2.6/arch/x86_64/kernel/:
msr.c semaphore.c
2.6/arch/x86_64/lib/:
dec_and_lock.c
2.6/drivers/bluetooth/:
hci_vhci.h
2.6/drivers/char/drm/:
gamma_context.h gamma_dma.c gamma_drm.h gamma_drv.c
gamma_drv.h gamma_lists.h gamma_lock.h gamma_old_dma.h
2.6/drivers/i2c/:
i2c-sensor-detect.c i2c-sensor-vid.c
2.6/drivers/infiniband/include/:
ib_cache.h ib_cm.h ib_fmr_pool.h ib_mad.h ib_pack.h
ib_sa.h ib_smi.h ib_user_cm.h ib_user_mad.h
ib_user_verbs.h ib_verbs.h
2.6/drivers/net/:
iseries_veth.h
2.6/drivers/net/wireless/:
ieee802_11.h
2.6/drivers/pci/:
gen-devlist.c names.c pci.ids
2.6/drivers/pci/hotplug/:
rpaphp_vio.c
2.6/fs/devpts/:
xattr_security.c
2.6/fs/umsdos/:
notes
2.6/include/asm-alpha/:
hdreg.h
2.6/include/asm-arm/:
hdreg.h
2.6/include/asm-arm26/:
hdreg.h
2.6/include/asm-generic/:
hdreg.h
2.6/include/asm-h8300/:
hdreg.h
2.6/include/asm-i386/:
hdreg.h
2.6/include/asm-ia64/:
hdreg.h
2.6/include/asm-m32r/:
hdreg.h
2.6/include/asm-m68k/:
hdreg.h
2.6/include/asm-m68knommu/:
hdreg.h
2.6/include/asm-mips/:
hdreg.h
2.6/include/asm-mips/hp-lj/:
asic.h
2.6/include/asm-mips/mach-vr41xx/:
timex.h
2.6/include/asm-mips/vr4181/:
irq.h vr4181.h
2.6/include/asm-parisc/:
hdreg.h
2.6/include/asm-ppc/:
8253pit.h agp.h bugs.h cputime.h div64.h
emergency-restart.h errno.h fcntl.h hdreg.h ioctl.h
ioctls.h ipc.h linkage.h local.h mc146818rtc.h mman.h
module.h msgbuf.h namei.h param.h percpu.h poll.h
resource.h segment.h sembuf.h setup.h shmbuf.h shmparam.h
siginfo.h socket.h sockios.h string.h termbits.h
termios.h timex.h topology.h unaligned.h user.h xor.h
2.6/include/asm-ppc64/:
8253pit.h agp.h bugs.h cputime.h div64.h
emergency-restart.h errno.h fcntl.h hdreg.h ioctl.h
ioctls.h ipc.h linkage.h local.h mc146818rtc.h mman.h
module.h msgbuf.h namei.h param.h percpu.h poll.h
resource.h segment.h sembuf.h setup.h shmbuf.h shmparam.h
siginfo.h socket.h sockios.h string.h termbits.h
termios.h timex.h topology.h unaligned.h user.h xor.h
2.6/include/asm-sh/:
hdreg.h
2.6/include/asm-sh64/:
hdreg.h
2.6/include/asm-sparc/:
hdreg.h segment.h
2.6/include/asm-sparc64/:
hdreg.h segment.h
2.6/include/asm-um/:
hdreg.h
2.6/include/asm-x86_64/:
hdreg.h
2.6/include/asm-xtensa/:
hdreg.h page.h.n
2.6/include/linux/:
i2c-sensor.h i2c-vid.h tcp_diag.h
2.6/include/linux/netfilter_ipv4/:
ip_logging.h
2.6/include/linux/netfilter_ipv6/:
ip6_logging.h
2.6/net/core/:
netfilter.c
2.6/sound/oss/:
skeleton.c
Revision Changes Path
1.17 +110 -140 2.6/Makefile
1.3 +34 -56 2.6/arch/ppc/Kconfig
1.10 +13 -10 2.6/arch/ppc/Makefile
1.14 +220 -146 2.6/arch/ppc/configs/apus_defconfig
1.12 +14 -16 2.6/arch/ppc/kernel/head.S
1.14 +1 -1 2.6/arch/ppc/kernel/misc.S
1.14 +1 -3 2.6/arch/ppc/kernel/ppc_ksyms.c
1.14 +26 -2 2.6/arch/ppc/kernel/setup.c
1.10 +2 -6 2.6/arch/ppc/kernel/time.c
1.10 +4 -3 2.6/arch/ppc/mm/init.c
1.13 +10 -10 2.6/include/asm-ppc/io.h
1.11 +0 -11 2.6/include/asm-ppc/pgtable.h
|
