Menu
▾
▴
linux-apus-devel
|
From: Roman Z. <zi...@us...> - 2004-02-04 21:24:00
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/video/
Changes by: zi...@sc....(none) 04/02/04 13:21:36
Log message:
forward port of the minimal changes to get APUS working with 2.6
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile
2.6/arch/ppc/amiga/:
amiints.c cia.c config.c time.c
2.6/arch/ppc/kernel/:
Makefile entry.S head.S misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
Makefile init.c pgtable.c
2.6/arch/ppc/platforms/:
apus_setup.c
2.6/drivers/block/:
amiflop.c
2.6/include/asm-m68k/:
bootinfo.h
2.6/include/asm-ppc/:
bootinfo.h current.h io.h machdep.h pgtable.h
2.6/include/video/:
vga.h
Revision Changes Path
1.2 +2 -2 2.6/Makefile
1.2 +4 -0 2.6/arch/ppc/Makefile
1.2 +13 -6 2.6/arch/ppc/amiga/amiints.c
1.2 +2 -1 2.6/arch/ppc/amiga/cia.c
1.2 +108 -277 2.6/arch/ppc/amiga/config.c
1.2 +0 -45 2.6/arch/ppc/amiga/time.c
1.2 +2 -1 2.6/arch/ppc/kernel/Makefile
1.2 +3 -0 2.6/arch/ppc/kernel/entry.S
1.2 +65 -13 2.6/arch/ppc/kernel/head.S
1.2 +4 -0 2.6/arch/ppc/kernel/misc.S
1.2 +0 -3 2.6/arch/ppc/kernel/ppc_ksyms.c
1.2 +5 -0 2.6/arch/ppc/kernel/setup.c
1.2 +2 -0 2.6/arch/ppc/kernel/time.c
1.2 +2 -1 2.6/arch/ppc/mm/Makefile
1.2 +0 -3 2.6/arch/ppc/mm/init.c
1.2 +2 -41 2.6/arch/ppc/mm/pgtable.c
1.2 +108 -142 2.6/arch/ppc/platforms/apus_setup.c
1.2 +1 -0 2.6/drivers/block/amiflop.c
1.2 +2 -0 2.6/include/asm-m68k/bootinfo.h
1.2 +1 -1 2.6/include/asm-ppc/bootinfo.h
1.2 +2 -2 2.6/include/asm-ppc/current.h
1.2 +13 -6 2.6/include/asm-ppc/io.h
1.2 +0 -4 2.6/include/asm-ppc/machdep.h
1.2 +1 -1 2.6/include/asm-ppc/pgtable.h
1.2 +8 -0 2.6/include/video/vga.h
|
|
From: Roman Z. <zi...@us...> - 2004-02-04 22:53:06
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/security/selinux/ss/
Changes by: zi...@sc....(none) 04/02/04 14:50:32
Log message:
conflict fixes from import of 2.6.1
Modified files:
./:
Makefile
2.6/arch/ppc/kernel/:
ppc_ksyms.c
Removed files:
2.6/arch/arm/boot/compressed/:
head-integrator.S
2.6/drivers/media/dvb/ttpci/:
av7110_firm.h
2.6/drivers/media/dvb/ttusb-dec/:
dec2000_frontend.c fdump.c ttusb_dec.h
2.6/drivers/usb/storage/:
raw_bulk.c raw_bulk.h
2.6/include/asm-arm26/:
keyboard.h.old
2.6/security/selinux/ss/:
global.h
Revision Changes Path
1.3 +9 -3 2.6/Makefile
1.3 +1 -1 2.6/arch/ppc/kernel/ppc_ksyms.c
|
|
From: Roman Z. <zi...@us...> - 2004-02-05 00:58:27
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/asm-sh/
Changes by: zi...@sc....(none) 04/02/04 16:56:03
Log message:
conflict fixes from import of 2.6.2
Modified files:
./:
Makefile
2.6/arch/ppc/kernel/:
Makefile misc.S ppc_ksyms.c setup.c
2.6/arch/ppc/mm/:
Makefile
2.6/include/asm-ppc/:
pgtable.h
Removed files:
2.6/Documentation/video4linux/bttv/:
CARDLIST
2.6/arch/arm/configs/:
cerfpda_defconfig cerfpod_defconfig
2.6/arch/cris/mm/:
extable.c
2.6/arch/h8300/mm/:
extable.c
2.6/arch/ia64/scripts/:
unwcheck.sh
2.6/arch/ia64/sn/io/:
sgi_if.c sgi_io_sim.c
2.6/arch/ia64/sn/io/platform_init/:
irix_io_init.c
2.6/arch/m68k/mm/:
extable.c
2.6/arch/m68knommu/mm/:
extable.c
2.6/arch/mips/mm/:
extable.c
2.6/arch/parisc/mm/:
extable.c
2.6/arch/ppc/mm/:
extable.c
2.6/arch/ppc/platforms/:
mpc82xx.h
2.6/arch/ppc64/kernel/:
htab.c
2.6/arch/ppc64/mm/:
extable.c
2.6/arch/s390/mm/:
extable.c
2.6/arch/sh/boards/adx/:
io.c mach.c
2.6/arch/sh/boards/bigsur/:
mach.c pci.c
2.6/arch/sh/boards/cat68701/:
io.c mach.c
2.6/arch/sh/boards/cqreek/:
io.c mach.c
2.6/arch/sh/boards/dreamcast/:
io.c mach.c pci.c
2.6/arch/sh/boards/ec3104/:
mach.c
2.6/arch/sh/boards/mpc1211/:
io.c mach.c
2.6/arch/sh/boards/saturn/:
mach.c
2.6/arch/sh/boards/sh2000/:
io.c mach.c
2.6/arch/sh/kernel/:
dma.c fpu.c pci-dma.c pci.c pci_auto.c pcibios.c rtc.c
2.6/arch/sh/kernel/cpu/:
dma.c
2.6/arch/sh/kernel/cpu/sh4/:
pci-sh7751.c pci-st40.c pci-st40.h
2.6/arch/sh/mm/:
__clear_user_page-sh4.S __copy_user_page-sh4.S
2.6/drivers/ide/ppc/:
Makefile
2.6/drivers/isdn/eicon/:
Divas_mod.c Kconfig Makefile adapter.h bri.c common.c
constant.h divalog.h divas.h dsp_defs.h dspdids.h eicon.h
eicon_dsp.h eicon_idi.c eicon_idi.h eicon_io.c
eicon_isa.c eicon_isa.h eicon_mod.c eicon_pci.c
eicon_pci.h fourbri.c fpga.c idi.c idi.h kprintf.c
lincfg.c linchr.c linio.c linsys.c log.c pc.h pc_maint.h
pr_pc.h pri.c sys.h uxio.h xlog.c
2.6/drivers/net/:
68360enet.c
2.6/drivers/s390/char/:
tuball.c tubfs.c tubio.h tubtty.c tubttyaid.c tubttybld.c
tubttyrcl.c tubttyscl.c tubttysiz.c
2.6/fs/xfs/:
xfs_buf.h xfsidbg.c
2.6/fs/xfs/linux/:
xfs_behavior.c xfs_behavior.h xfs_iomap.c
2.6/fs/xfs/pagebuf/:
page_buf.c page_buf.h page_buf_internal.h
page_buf_locking.c page_buf_trace.h
2.6/fs/xfs/support/:
kmem.h mrlock.c mrlock.h mutex.h sema.h spin.h sv.h
time.h
2.6/include/asm-ia64/:
machvec_sn1.h
2.6/include/asm-ia64/sn/:
invent.h nag.h
2.6/include/asm-ia64/sn/arc/:
hinv.h types.h
2.6/include/asm-ppc64/iSeries/:
mf_proc.h veth-proc.h
2.6/include/asm-sh/:
bigsur.h dc_sysasic.h ec3104.h hd64461.h hd64465.h
hd64465_gpio.h hitachi_7751se.h hitachi_se.h io_7751se.h
io_adx.h io_bigsur.h io_cat68701.h io_dc.h io_ec3104.h
io_generic.h io_hd64461.h io_hd64465.h io_se.h
io_sh2000.h io_unknown.h keyboard-ec3104.h pci-sh7751.h
serial-bigsur.h serial-ec3104.h smc37c93x.h
Revision Changes Path
1.4 +12 -7 2.6/Makefile
1.3 +1 -2 2.6/arch/ppc/kernel/Makefile
1.3 +1 -0 2.6/arch/ppc/kernel/misc.S
1.4 +16 -16 2.6/arch/ppc/kernel/ppc_ksyms.c
1.3 +0 -1 2.6/arch/ppc/kernel/setup.c
1.3 +1 -1 2.6/arch/ppc/mm/Makefile
1.3 +9 -0 2.6/include/asm-ppc/pgtable.h
|
|
From: Roman Z. <zi...@us...> - 2004-02-05 01:26:42
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/arch/ppc/configs/
Changes by: zi...@sc....(none) 04/02/04 17:24:11
Log message:
update defconfig
Modified files:
2.6/arch/ppc/:
defconfig
2.6/arch/ppc/configs/:
apus_defconfig
Revision Changes Path
1.2 +299 -593 2.6/arch/ppc/defconfig
1.2 +148 -125 2.6/arch/ppc/configs/apus_defconfig
|
|
From: Roman Z. <zi...@us...> - 2004-02-21 21:54:11
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/net/sctp/
Changes by: zi...@sc....(none) 04/02/21 13:42:04
Log message:
conflict fixes from import of 2.6.3
Modified files:
./:
Makefile
2.6/arch/ppc/:
defconfig
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
Makefile entry.S head.S misc.S ppc_ksyms.c setup.c
2.6/arch/ppc/mm/:
init.c pgtable.c
2.6/include/asm-ppc/:
bootinfo.h io.h machdep.h pgtable.h
Added files:
2.6/include/asm-sh/:
io_generic.h
Removed files:
2.6/Documentation/networking/:
8139too.txt
2.6/Documentation/scsi/:
AM53C974.txt
2.6/arch/ppc/platforms/:
prep_time.c
2.6/arch/ppc/platforms/4xx/:
beech.c beech.h cedar.c cedar.h ibm405lp.c ibm405lp.h
ibmnp405l.c ibmnp405l.h ibmnp4gs.c ibmnp4gs.h ibmstb3.c
ibmstb3.h oak_setup.c redwood.c redwood.h
2.6/drivers/base/:
memblk.c
2.6/drivers/char/watchdog/:
i810-tco.c i810-tco.h
2.6/drivers/pci/:
pool.c
2.6/drivers/scsi/:
AM53C974.c AM53C974.h mac_NCR5380.c
2.6/drivers/usb/core/:
usb-debug.c
2.6/drivers/usb/image/:
scanner.c scanner.h
2.6/include/asm-i386/:
memblk.h
2.6/include/asm-ia64/sn/:
alenlist.h
2.6/include/asm-x86_64/:
memblk.h
2.6/include/linux/:
memblk.h pci_msi.h
2.6/lib/:
mask.c
2.6/net/sctp/:
adler32.c
Revision Changes Path
1.5 +2 -2 2.6/Makefile
1.3 +166 -148 2.6/arch/ppc/defconfig
1.3 +166 -148 2.6/arch/ppc/configs/apus_defconfig
1.4 +2 -1 2.6/arch/ppc/kernel/Makefile
1.3 +2 -2 2.6/arch/ppc/kernel/entry.S
1.3 +18 -63 2.6/arch/ppc/kernel/head.S
1.4 +13 -19 2.6/arch/ppc/kernel/misc.S
1.5 +1 -14 2.6/arch/ppc/kernel/ppc_ksyms.c
1.4 +27 -15 2.6/arch/ppc/kernel/setup.c
1.3 +2 -0 2.6/arch/ppc/mm/init.c
1.3 +10 -0 2.6/arch/ppc/mm/pgtable.c
1.3 +11 -0 2.6/include/asm-ppc/bootinfo.h
1.3 +4 -1 2.6/include/asm-ppc/io.h
1.3 +3 -1 2.6/include/asm-ppc/machdep.h
1.4 +18 -6 2.6/include/asm-ppc/pgtable.h
|
|
From: Roman Z. <zi...@us...> - 2004-03-25 22:24:25
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/net/irda/
Changes by: zi...@sc....(none) 04/03/25 14:13:36
Log message:
conflict fixes from import of 2.6.4
Modified files:
./:
Makefile
2.6/arch/ppc/:
defconfig
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
head.S setup.c time.c
2.6/include/asm-ppc/:
machdep.h
Added files:
2.6/arch/mips/mm/:
extable.c
Removed files:
2.6/Documentation/sound/:
rme96xx
2.6/arch/arm/common/:
sa1111-pcipool.c
2.6/arch/arm/kernel/:
pm.c
2.6/arch/m68k/kernel/:
m68k_defs.c m68k_defs.head
2.6/arch/mips/:
defconfig-atlas defconfig-capcella defconfig-cobalt
defconfig-ddb5476 defconfig-ddb5477 defconfig-decstation
defconfig-e55 defconfig-eagle defconfig-ev64120
defconfig-ev96100 defconfig-hp-lj defconfig-ip22
defconfig-ip27 defconfig-ip32 defconfig-it8172
defconfig-ivr defconfig-jmr3927 defconfig-lasat200
defconfig-malta defconfig-mpc30x defconfig-ocelot
defconfig-osprey defconfig-pb1000 defconfig-pb1100
defconfig-pb1500 defconfig-rm200 defconfig-sb1250-swarm
defconfig-sead defconfig-tb0226 defconfig-tb0229
defconfig-workpad
2.6/arch/mips/au1000/common/:
rtc.c
2.6/arch/mips/au1000/db1x00/:
setup.c
2.6/arch/mips/au1000/pb1000/:
setup.c
2.6/arch/mips/au1000/pb1100/:
setup.c
2.6/arch/mips/au1000/pb1500/:
setup.c
2.6/arch/mips/cobalt/:
via.c
2.6/arch/mips/ddb5xxx/ddb5074/:
time.c
2.6/arch/mips/dec/:
rtc-dec.c
2.6/arch/mips/galileo-boards/ev64120/:
Makefile README dma.c i2o.c int-handler.S irq-handler.c
irq.c promcon.c reset.c serialGT.c setup.c
2.6/arch/mips/galileo-boards/generic/:
Makefile reset.c
2.6/arch/mips/gt64120/common/:
gt_irq.c
2.6/arch/mips/jazz/:
floppy-jazz.c jazz-ksyms.c kbd-jazz.c rtc-jazz.c
2.6/arch/mips/jmr3927/rbhma3100/:
rtc.c
2.6/arch/mips/kernel/:
pci-dma.c
2.6/arch/mips/lib/:
floppy-no.c floppy-std.c ide-no.c ide-std.c rtc-no.c
rtc-std.c
2.6/arch/mips/lib-32/:
strlen_user.S strncpy_user.S strnlen_user.S
2.6/arch/mips/lib-64/:
strlen_user.S strncpy_user.S strnlen_user.S
2.6/arch/mips/mips-boards/atlas/:
atlas_rtc.c
2.6/arch/mips/mips-boards/malta/:
malta_rtc.c
2.6/arch/mips/mips-boards/sead/:
sead_time.c
2.6/arch/mips/mm/:
loadmmu.c pg-r3k.c
2.6/arch/mips/mm-32/:
init.c pg-r4k.S
2.6/arch/mips/mm-64/:
init.c pg-r4k.c
2.6/arch/mips/pci/:
common.c fixups-ev96100.c ops-ev64120.c ops-ev96100.c
ops-jmr3927.c ops-ocelot.c pci-auto.c pci-cobalt.c
pci-lasat.c pci-mips.c pci-sni.c
2.6/arch/mips/sgi-ip22/:
ip22-ksyms.c ip22-rtc.c
2.6/arch/mips/sgi-ip32/:
ip32-rtc.c
2.6/arch/mips/sibyte/swarm/:
cmdline.c rtc.c
2.6/arch/mips/sni/:
io.c
2.6/arch/mips/tx4927/toshiba_rbtx4927/:
toshiba_rbtx4927_pci_fixup.c toshiba_rbtx4927_pci_ops.c
2.6/arch/mips/vr41xx/casio-e55/:
ide-e55.c
2.6/arch/mips/vr41xx/common/:
reset.c time.c
2.6/arch/mips/vr41xx/ibm-workpad/:
ide-workpad.c
2.6/arch/mips/vr41xx/nec-eagle/:
ide-eagle.c
2.6/arch/mips/vr41xx/victor-mpc30x/:
ide-mpc30x.c
2.6/arch/mips/vr41xx/zao-capcella/:
ide-capcella.c
2.6/arch/ppc64/kernel/:
pci_dma.c
2.6/arch/x86_64/kernel/:
bluesmoke.c
2.6/drivers/isdn/hisax/:
cert.c hisax_fcclassic.c hisax_fcclassic.h hisax_hfcpci.c
hisax_hfcpci.h hisax_hscx.c hisax_hscx.h ipac.c
md5sums.asc rawhdlc.c rawhdlc.h
2.6/drivers/isdn/i4l/:
isdn_ciscohdlck.c isdn_ciscohdlck.h isdn_fsm.c
isdn_net_lib.c isdn_net_lib.h isdn_ppp_ccp.c
isdn_ppp_ccp.h isdn_ppp_mp.c isdn_ppp_mp.h isdn_ppp_vj.c
isdn_ppp_vj.h
2.6/drivers/md/:
dm-ioctl-v1.c dm-ioctl-v4.c
2.6/drivers/net/e100/:
LICENSE Makefile e100.h e100_config.c e100_config.h
e100_eeprom.c e100_main.c e100_phy.c e100_phy.h
e100_test.c e100_ucode.h
2.6/drivers/net/tokenring/:
tms380tr_microcode.h
2.6/drivers/parport/:
init.c
2.6/drivers/video/:
cvisionppc.h
2.6/fs/devfs/:
internal.h
2.6/fs/hfs/:
ChangeLog FAQ.txt HFS.txt INSTALL.txt TODO balloc.c
bdelete.c bins_del.c binsert.c bitops.c dir_cap.c
dir_dbl.c dir_nat.c file.c file_cap.c file_hdr.c
hfs_btree.h version.c
2.6/fs/xfs/linux/:
mrlock.c
2.6/include/asm-mips/:
au1000.h au1000_dma.h au1000_gpio.h au1000_pcmcia.h
au1000_usbdev.h db1x00.h keyboard.h pb1000.h pb1100.h
pb1500.h semaphore-helper.h smplock.h
2.6/include/asm-mips/dec/:
rtc-dec.h
2.6/include/asm-mips/galileo-boards/:
ev64120.h ev64120int.h
2.6/include/asm-mips/gt64120/:
gt64120.h
2.6/include/asm-mips/gt64120/momenco_ocelot/:
gt64120_dep.h
2.6/include/asm-mips/jmr3927/:
ds1742rtc.h pci.h
2.6/include/asm-ppc64/:
pci_dma.h
2.6/include/asm-ppc64/iSeries/:
iSeries_dma.h
2.6/include/asm-sparc/:
cprefix.h
2.6/include/linux/:
dm-ioctl-v1.h dm-ioctl-v4.h hfs_fs.h hfs_fs_i.h
hfs_fs_sb.h hfs_sysdep.h if_pppvar.h modsetver.h ppp.h
2.6/include/linux/isdn/:
fsm.h
2.6/include/video/:
pm2fb.h
2.6/net/bluetooth/:
hci_proc.c
2.6/net/irda/:
irsyms.c
Revision Changes Path
1.6 +9 -1 2.6/Makefile
1.4 +13 -8 2.6/arch/ppc/defconfig
1.4 +13 -8 2.6/arch/ppc/configs/apus_defconfig
1.4 +16 -16 2.6/arch/ppc/kernel/head.S
1.5 +4 -4 2.6/arch/ppc/kernel/setup.c
1.3 +1 -0 2.6/arch/ppc/kernel/time.c
1.4 +2 -1 2.6/include/asm-ppc/machdep.h
|
|
From: Sven L. <sve...@wa...> - 2004-03-25 22:45:23
|
On Thu, Mar 25, 2004 at 02:13:36PM -0800, Roman Zippel wrote: > CVSROOT: /cvsroot/linux-apus > Module name: 2.6 > Repository: 2.6/net/irda/ > Changes by: zi...@sc....(none) 04/03/25 14:13:36 > > Log message: > conflict fixes from import of 2.6.4 Roman, ... What are the plans with regard integration of those patches with the main kernel.org tree, or even the linuxppc tree ? Especially now that the -benh tree has become mostly obsolet ? Friendly, Sven Luther |
|
From: Roman Z. <zi...@us...> - 2004-05-23 23:19:47
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/scripts/
Changes by: zi...@sc....(none) 04/05/23 16:19:41
Log message:
conflict fixes from import of 2.6.5
Modified files:
./:
Makefile
2.6/arch/ppc/:
defconfig
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
entry.S head.S misc.S ppc_ksyms.c
2.6/arch/ppc/mm/:
pgtable.c
2.6/include/asm-ppc/:
io.h machdep.h
Removed files:
2.6/Documentation/usb/:
brlvger.txt scanner.txt
2.6/arch/arm/mach-anakin/:
Makefile arch.c irq.c mm.c
2.6/arch/h8300/platform/h8300h/:
ints.c
2.6/arch/i386/kernel/:
edd.c
2.6/arch/i386/lib/:
iodebug.c
2.6/arch/ia64/hp/sim/:
simscsi.h
2.6/arch/ppc/boot/common/:
cpc700_memory.c mpc10x_memory.c
2.6/arch/ppc/boot/prep/:
Makefile dummy.c head.S iso_font.h kbd.c misc.c vreset.c
2.6/arch/ppc/platforms/:
pplus_pci.c pplus_setup.c spruce_pci.c spruce_serial.h
spruce_setup.c
2.6/arch/ppc64/kernel/:
pmc.c proc_pmc.c
2.6/arch/sh/configs/:
defconfig-adx defconfig-cqreek defconfig-dreamcast
defconfig-hp680 defconfig-se7751 defconfig-snapgear
defconfig-systemh
2.6/arch/sh/drivers/pci/:
pci-dma.c
2.6/arch/x86_64/ia32/:
vsyscall.S
2.6/arch/x86_64/kernel/acpi/:
boot.c
2.6/arch/x86_64/lib/:
iodebug.c
2.6/drivers/i2c/busses/:
i2c-elv.c i2c-philips-par.c i2c-velleman.c
2.6/drivers/input/misc/:
gsc_ps2.c
2.6/drivers/isdn/hardware/eicon/:
dlist.c dlist.h i4l_idi.c i4l_idi.h i4lididrv.c
i4lididrv.h
2.6/drivers/macintosh/:
therm_adt7467.c
2.6/drivers/serial/:
anakin.c
2.6/drivers/usb/misc/:
brlvger.c
2.6/drivers/video/:
anakinfb.c
2.6/include/asm-arm/arch-anakin/:
dma.h hardware.h ide.h io.h irqs.h memory.h param.h
serial.h serial_reg.h system.h time.h timex.h
uncompress.h vmalloc.h
2.6/include/asm-i386/:
edd.h
2.6/include/asm-parisc/:
keyboard.h md.h
2.6/include/asm-ppc/:
pplus.h
2.6/include/asm-ppc64/:
pmc.h proc_fs.h proc_pmc.h
2.6/include/asm-sh/dreamcast/:
io.h
2.6/include/asm-sh/sh2000/:
io.h
2.6/include/linux/:
brlvger.h hpfs_fs_i.h hpfs_fs_sb.h
2.6/scripts/:
docproc.c fixdep.c split-include.c
Revision Changes Path
1.7 +62 -49 2.6/Makefile
1.5 +14 -9 2.6/arch/ppc/defconfig
1.5 +14 -9 2.6/arch/ppc/configs/apus_defconfig
1.4 +22 -4 2.6/arch/ppc/kernel/entry.S
1.5 +4 -7 2.6/arch/ppc/kernel/head.S
1.5 +1 -11 2.6/arch/ppc/kernel/misc.S
1.6 +0 -7 2.6/arch/ppc/kernel/ppc_ksyms.c
1.4 +1 -1 2.6/arch/ppc/mm/pgtable.c
1.4 +29 -25 2.6/include/asm-ppc/io.h
1.5 +2 -0 2.6/include/asm-ppc/machdep.h
|
|
From: Roman Z. <zi...@us...> - 2004-05-24 20:32:05
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/drivers/net/
Changes by: zi...@sc....(none) 04/05/24 13:31:58
Log message:
initdata cannot be const
Modified files:
2.6/drivers/net/:
zorro8390.c
Revision Changes Path
1.2 +72 -65 2.6/drivers/net/zorro8390.c
|
|
From: Roman Z. <zi...@us...> - 2004-05-24 20:32:43
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/asm-ppc/
Changes by: zi...@sc....(none) 04/05/24 13:32:37
Log message:
use correct asm ops
Modified files:
2.6/include/asm-ppc/:
io.h
Revision Changes Path
1.5 +4 -4 2.6/include/asm-ppc/io.h
|
|
From: Roman Z. <zi...@us...> - 2004-05-24 20:33:36
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/asm-ppc/
Changes by: zi...@sc....(none) 04/05/24 13:33:29
Log message:
make read/write functions independent from io.h
Modified files:
2.6/include/asm-ppc/:
zorro.h
Revision Changes Path
1.2 +44 -7 2.6/include/asm-ppc/zorro.h
|
|
From: Roman Z. <zi...@us...> - 2004-05-24 21:37:01
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/oss/
Changes by: zi...@sc....(none) 04/05/24 14:36:54
Log message:
conflict fixes from import of 2.6.6
Modified files:
./:
Makefile
2.6/arch/ppc/:
defconfig
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
head.S misc.S
2.6/arch/ppc/mm/:
pgtable.c
Added files:
2.6/arch/mips/pci/:
pci-lasat.c
Removed files:
2.6/Documentation/DocBook/:
parport-multi.fig parport-share.fig parport-structure.fig
parportbook.tmpl
2.6/arch/arm/common/:
sa1111-pcibuf.c
2.6/arch/arm/configs/:
anakin_defconfig
2.6/arch/arm/mm/:
fault-common.c
2.6/arch/ia64/kernel/:
efivars.c
2.6/arch/mips/:
jaguar-atx_defconfig
2.6/arch/mips/configs/:
hp-lj_defconfig
2.6/arch/mips/lasat/:
pci.c
2.6/arch/mips/momentum/jaguar_atx/:
mv-irq.c pci-irq.c pci.c
2.6/arch/mips/momentum/ocelot_c/:
mv-irq.c
2.6/arch/mips/pmc-sierra/yosemite/:
i2c-yosemite.c
2.6/arch/mips/sgi-ip27/:
ip27-setup.c
2.6/arch/mips/sgi-ip32/:
ip32-timer.c
2.6/arch/mips/vr41xx/casio-e55/:
init.c
2.6/arch/mips/vr41xx/ibm-workpad/:
init.c
2.6/arch/mips/vr41xx/nec-eagle/:
init.c
2.6/arch/mips/vr41xx/tanbac-tb0226/:
init.c
2.6/arch/mips/vr41xx/tanbac-tb0229/:
init.c
2.6/arch/mips/vr41xx/victor-mpc30x/:
init.c
2.6/arch/mips/vr41xx/zao-capcella/:
init.c
2.6/arch/ppc/platforms/:
k2_pci.c k2_setup.c mcpn765_pci.c mcpn765_setup.c
pcore_pci.c pcore_setup.c prpmc750_pci.c prpmc750_setup.c
prpmc800_pci.c prpmc800_setup.c
2.6/arch/ppc/syslib/:
pplus_common.c
2.6/arch/ppc64/oprofile/:
init.c
2.6/arch/x86_64/kernel/mtrr/:
Makefile
2.6/drivers/char/ipmi/:
ipmi_kcs_intf.c ipmi_kcs_sm.h
2.6/drivers/char/watchdog/:
amd7xx_tco.c
2.6/drivers/net/:
sis190.c
2.6/drivers/net/tulip/:
ChangeLog
2.6/drivers/net/wan/lmc/:
lmc_proto_raw.h lmc_ver.h
2.6/drivers/s390/net/:
qeth.c
2.6/drivers/serial/:
amba.c
2.6/fs/hfs/:
COPYING
2.6/fs/msdos/:
msdosfs_syms.c
2.6/fs/ntfs/:
time.c
2.6/fs/vfat/:
vfatfs_syms.c
2.6/include/asm-arm/hardware/:
serial_amba.h
2.6/include/asm-i386/mach-default/:
mach_resources.h
2.6/include/asm-i386/mach-pc9800/:
mach_resources.h
2.6/include/asm-mips/:
mv64340_dep.h page-32.h page-64.h
2.6/include/asm-mips/mach-au1x00/:
au1000_pcmcia.h
2.6/include/asm-mips/sn/:
intr_public.h
2.6/include/linux/:
rmap-locking.h
2.6/include/linux/sunrpc/:
name_lookup.h
2.6/include/net/irda/:
ali-ircc.h au1000_ircc.h irda-usb.h irport.h nsc-ircc.h
smc-ircc.h toshoboe.h vlsi_ir.h w83977af.h w83977af_ir.h
2.6/scripts/:
MAKEDEV.ide MAKEDEV.snd
2.6/sound/oss/:
724hwmcode.h Hwmcode.h
Revision Changes Path
1.8 +229 -131 2.6/Makefile
1.6 +34 -40 2.6/arch/ppc/defconfig
1.6 +34 -40 2.6/arch/ppc/configs/apus_defconfig
1.6 +5 -4 2.6/arch/ppc/kernel/head.S
1.6 +18 -3 2.6/arch/ppc/kernel/misc.S
1.5 +2 -2 2.6/arch/ppc/mm/pgtable.c
|
|
From: Roman Z. <zi...@us...> - 2004-07-03 17:53:58
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/arch/ppc/amiga/
Changes by: zi...@sc....(none) 04/07/03 10:53:51
Log message:
remove unneeded time.c
Modified files:
2.6/arch/ppc/amiga/:
Makefile
Removed files:
2.6/arch/ppc/amiga/:
time.c
Revision Changes Path
1.2 +3 -3 2.6/arch/ppc/amiga/Makefile
|
|
From: Roman Z. <zi...@us...> - 2004-07-03 17:55:28
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/arch/ppc/amiga/
Changes by: zi...@sc....(none) 04/07/03 10:55:23
Log message:
remove unneeded include <asm-m68k/machdep.h>
Modified files:
2.6/arch/ppc/amiga/:
config.c
Revision Changes Path
1.3 +0 -2 2.6/arch/ppc/amiga/config.c
|
|
From: Roman Z. <zi...@us...> - 2004-07-03 18:00:06
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/asm-ppc/
Changes by: zi...@sc....(none) 04/07/03 11:00:00
Log message:
move a few declarations to amigahw.h
Modified files:
2.6/arch/ppc/platforms/:
apus_setup.c
2.6/include/asm-ppc/:
amigahw.h
Revision Changes Path
1.3 +0 -11 2.6/arch/ppc/platforms/apus_setup.c
1.2 +9 -2 2.6/include/asm-ppc/amigahw.h
|
|
From: Roman Z. <zi...@us...> - 2004-07-03 18:02:10
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/asm-ppc/
Changes by: zi...@sc....(none) 04/07/03 11:02:04
Log message:
Use __pa()/__va() instead of direct calculation.
remove a few CONFIG_APUS ifdefs
Modified files:
2.6/include/asm-ppc/:
io.h
Revision Changes Path
1.6 +2 -18 2.6/include/asm-ppc/io.h
|
|
From: Roman Z. <zi...@us...> - 2004-07-03 20:50:55
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/pci/ice1712/
Changes by: zi...@sc....(none) 04/07/03 13:50:49
Log message:
conflict fixes from import of 2.6.7
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile defconfig
2.6/arch/ppc/configs/:
apus_defconfig
2.6/arch/ppc/kernel/:
Makefile entry.S head.S misc.S ppc_ksyms.c setup.c
2.6/arch/ppc/mm/:
Makefile init.c pgtable.c
2.6/include/asm-m68k/:
bootinfo.h
2.6/include/asm-ppc/:
io.h pgtable.h
Removed files:
2.6/Documentation/arm/SA1100/:
PCMCIA
2.6/Documentation/arm/XScale/:
cache-lock.txt pmu.txt tlb-lock.txt
2.6/Documentation/arm/XScale/ADIFCC/:
80200EVB
2.6/Documentation/arm/XScale/IOP3XX/:
IQ80310 IQ80321 aau.txt dma.txt message.txt pmon.txt
2.6/arch/arm/mach-omap/:
innovator1510.c innovator1610.c irq.h omap-generic.c
omap-perseus2.c
2.6/arch/cris/kernel/:
hexify.c ksyms.c
2.6/arch/i386/mach-es7000/:
es7000.c setup.c topology.c
2.6/arch/ia64/kernel/:
perfmon_hpsim.h
2.6/arch/ppc/mm/:
cachemap.c
2.6/arch/ppc/ocp/:
Makefile ocp-driver.c ocp-probe.c ocp.c
2.6/arch/s390/lib/:
memset.S memset64.S strcmp.S strcmp64.S strcpy.S
strcpy64.S strncpy.S strncpy64.S
2.6/drivers/char/:
dz.c dz.h sh-sci.c sh-sci.h
2.6/drivers/i2c/busses/:
i2c-ixp42x.c
2.6/drivers/ide/:
ide-tcq.c
2.6/drivers/ide/pci/:
alim15x3.h amd74xx.h cmd640.h cs5520.h cs5530.h ns87415.h
rz1000.h sc1200.h siimage.h sis5513.h sl82c105.h
slc90e66.h triflex.h trm290.h via82cxxx.h
2.6/drivers/ide/ppc/:
swarm.c
2.6/drivers/net/:
auto_irq.c rcif.h rclanmtl.c rclanmtl.h rcpci45.c
2.6/drivers/net/wan/:
comx-hw-comx.c comx-hw-locomx.c comx-hw-mixcom.c
comx-hw-munich.c comx-proto-fr.c comx-proto-lapb.c
comx-proto-ppp.c comx.c comx.h comxhw.h falc-lh.h hscx.h
mixcom.h munich32x.h wanxlfw.inc
2.6/drivers/pcmcia/:
sa1100.h sa11xx_core.c sa11xx_core.h
2.6/drivers/scsi/:
qlogicfas.h
2.6/drivers/scsi/pcmcia/:
qlogic_core.c
2.6/drivers/usb/core/:
driverfs.c
2.6/fs/intermezzo/:
Makefile cache.c dcache.c dir.c ext_attr.c file.c
fileset.c inode.c intermezzo_fs.h intermezzo_idl.h
intermezzo_journal.h intermezzo_kml.h intermezzo_lib.h
intermezzo_psdev.h intermezzo_upcall.h journal.c
journal_ext2.c journal_ext3.c journal_obdfs.c
journal_reiserfs.c journal_tmpfs.c journal_xfs.c kml.c
kml_decode.c kml_reint.c kml_setup.c kml_unpack.c
kml_utils.c methods.c presto.c psdev.c replicator.c
super.c sysctl.c upcall.c vfs.c
2.6/fs/xfs/linux/:
kmem.h mrlock.h mutex.h sema.h spin.h sv.h time.h
xfs_aops.c xfs_buf.c xfs_buf.h xfs_cred.h xfs_file.c
xfs_fs_subr.c xfs_fs_subr.h xfs_globals.c xfs_globals.h
xfs_ioctl.c xfs_iops.c xfs_iops.h xfs_linux.h xfs_lrw.c
xfs_lrw.h xfs_stats.c xfs_stats.h xfs_super.c xfs_super.h
xfs_sysctl.c xfs_sysctl.h xfs_version.h xfs_vfs.c
xfs_vfs.h xfs_vnode.c xfs_vnode.h
2.6/include/asm-alpha/:
rmap.h
2.6/include/asm-arm/:
rmap.h
2.6/include/asm-arm/arch-cl7500/:
ide.h keyboard.h
2.6/include/asm-arm/arch-clps711x/:
keyboard.h
2.6/include/asm-arm/arch-ebsa110/:
ide.h
2.6/include/asm-arm/arch-ebsa285/:
ide.h
2.6/include/asm-arm/arch-iop3xx/:
ide.h
2.6/include/asm-arm/arch-l7200/:
ide.h keyboard.h
2.6/include/asm-arm/arch-nexuspci/:
ide.h
2.6/include/asm-arm/arch-omap/:
omap-h2.h omap-innovator.h omap-perseus2.h
2.6/include/asm-arm/arch-pxa/:
ide.h keyboard.h
2.6/include/asm-arm/arch-rpc/:
ide.h
2.6/include/asm-arm/arch-s3c2410/:
ide.h
2.6/include/asm-arm/arch-sa1100/:
keyboard.h
2.6/include/asm-arm/arch-shark/:
ide.h keyboard.h
2.6/include/asm-arm/arch-tbox/:
ide.h
2.6/include/asm-arm26/:
rmap.h
2.6/include/asm-cris/:
rmap.h
2.6/include/asm-generic/:
rmap.h
2.6/include/asm-h8300/:
h8300_smsc.h
2.6/include/asm-h8300/aki3068net/:
machine-depend.h
2.6/include/asm-h8300/edosk2674/:
machine-depend.h
2.6/include/asm-h8300/generic/:
machine-depend.h timer_rate.h
2.6/include/asm-h8300/h8max/:
machine-depend.h
2.6/include/asm-i386/:
rmap.h
2.6/include/asm-ia64/:
rmap.h
2.6/include/asm-m68k/:
rmap.h
2.6/include/asm-m68knommu/:
rmap.h
2.6/include/asm-mips/:
rmap.h
2.6/include/asm-parisc/:
rmap.h
2.6/include/asm-ppc/:
rmap.h
2.6/include/asm-ppc64/:
rmap.h
2.6/include/asm-s390/:
rmap.h
2.6/include/asm-sh/:
rmap.h
2.6/include/asm-sparc/:
rmap.h
2.6/include/asm-sparc64/:
rmap.h
2.6/include/asm-um/:
rmap.h
2.6/include/asm-v850/:
rmap.h
2.6/include/asm-x86_64/:
rmap.h
2.6/net/bluetooth/:
syms.c
2.6/sound/pci/ice1712/:
prodigy.c prodigy.h
Revision Changes Path
1.9 +24 -12 2.6/Makefile
1.3 +2 -3 2.6/arch/ppc/Makefile
1.7 +6 -6 2.6/arch/ppc/defconfig
1.7 +6 -6 2.6/arch/ppc/configs/apus_defconfig
1.5 +2 -1 2.6/arch/ppc/kernel/Makefile
1.5 +139 -13 2.6/arch/ppc/kernel/entry.S
1.7 +11 -11 2.6/arch/ppc/kernel/head.S
1.7 +22 -9 2.6/arch/ppc/kernel/misc.S
1.7 +2 -14 2.6/arch/ppc/kernel/ppc_ksyms.c
1.6 +7 -0 2.6/arch/ppc/kernel/setup.c
1.4 +0 -1 2.6/arch/ppc/mm/Makefile
1.4 +12 -2 2.6/arch/ppc/mm/init.c
1.6 +19 -9 2.6/arch/ppc/mm/pgtable.c
1.3 +5 -5 2.6/include/asm-m68k/bootinfo.h
1.7 +0 -38 2.6/include/asm-ppc/io.h
1.5 +15 -1 2.6/include/asm-ppc/pgtable.h
|
|
From: Roman Z. <zi...@us...> - 2004-07-04 00:52:24
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/arch/ppc/configs/
Changes by: zi...@sc....(none) 04/07/03 17:52:18
Log message:
enable fb console in default config
Modified files:
2.6/arch/ppc/:
defconfig
2.6/arch/ppc/configs/:
apus_defconfig
Revision Changes Path
1.8 +6 -1 2.6/arch/ppc/defconfig
1.8 +6 -1 2.6/arch/ppc/configs/apus_defconfig
|
|
From: Roman Z. <zi...@us...> - 2004-07-04 00:53:06
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/asm-ppc/
Changes by: zi...@sc....(none) 04/07/03 17:53:00
Log message:
fix ordering of arguments for z_write
Modified files:
2.6/include/asm-ppc/:
zorro.h
Revision Changes Path
1.3 +3 -3 2.6/include/asm-ppc/zorro.h
|
|
From: Roman Z. <zi...@us...> - 2004-09-25 21:10:07
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/sound/isa/cs423x/
Changes by: zi...@sc....(none) 04/09/25 14:09:59
Log message:
conflict fixes from import of 2.6.8
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile defconfig
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/:
Makefile init.c pgtable.c
2.6/include/asm-ppc/:
io.h machdep.h pgtable.h
2.6/include/video/:
vga.h
Added files:
2.6/arch/mips/pmc-sierra/yosemite/:
i2c-yosemite.c
Removed files:
2.6/Documentation/:
as-iosched.txt
2.6/Documentation/i2c/:
i2c-pport i2c-velleman
2.6/arch/arm/boot/compressed/:
head-ftvpci.S
2.6/arch/arm/common/:
platform.c plx90x0.c
2.6/arch/arm/configs/:
adi_evb_defconfig
2.6/arch/arm/kernel/:
time-acorn.c
2.6/arch/arm/mach-adifcc/:
Makefile arch.c irq.c mm.c
2.6/arch/arm/mach-ftvpci/:
Makefile core.c leds.c pci.c
2.6/arch/arm/mach-lh7a40x/:
fiq.S ide-lpd7a40x.c
2.6/arch/arm/mach-tbox/:
Makefile core.c
2.6/arch/i386/boot98/:
Makefile bootsect.S install.sh mtools.conf.in setup.S
video.S
2.6/arch/i386/boot98/compressed/:
Makefile head.S misc.c vmlinux.scr
2.6/arch/i386/boot98/tools/:
build.c
2.6/arch/i386/kernel/:
std_resources.c
2.6/arch/i386/mach-pc9800/:
Makefile setup.c std_resources.c topology.c
2.6/arch/mips/configs/:
eagle_defconfig
2.6/arch/mips/mm/:
tlbex-r3k.S
2.6/arch/mips/mm-32/:
Makefile tlbex-r4k.S
2.6/arch/mips/mm-64/:
Makefile tlb-dbg-r4k.c tlb-glue-r4k.S tlb-glue-sb1.S
tlbex-r4k.S
2.6/arch/mips/momentum/ocelot_c/:
pci-irq.c
2.6/arch/mips/momentum/ocelot_g/:
gt64240.h gt64240_dep.h pci-irq.c
2.6/arch/mips/pci/:
fixup-eagle.c fixup-mv64340.c fixup-tb0229.c
fixup-victor-mpc30x.c ops-mv64340.c ops-vrc4173.c
2.6/arch/mips/vr41xx/nec-eagle/:
Makefile irq.c setup.c
2.6/arch/mips/vr41xx/tanbac-tb0229/:
reboot.c
2.6/arch/ppc/8260_io/:
commproc.c uart.c
2.6/arch/ppc/kernel/:
pci-dma.c
2.6/arch/ppc/platforms/:
error_log.c error_log.h proc_rtas.c rpxsuper.h
2.6/arch/ppc/syslib/:
ppc8260_pic.c ppc8260_pic.h
2.6/arch/sh/boards/systemh/:
Makefile io.c irq.c setup.c
2.6/arch/sparc64/lib/:
blockops.S
2.6/drivers/block/:
carmel.c floppy98.c
2.6/drivers/char/:
h8.c h8.h lp_old98.c sn_serial.c upd4990a.c
2.6/drivers/ide/legacy/:
hd98.c pc9800.c
2.6/drivers/input/keyboard/:
98kbd.c
2.6/drivers/input/misc/:
98spkr.c
2.6/drivers/input/mouse/:
98busmouse.c
2.6/drivers/input/serio/:
98kbd-io.c
2.6/drivers/mtd/nand/:
nand.c
2.6/drivers/net/:
ne2k_cbus.c ne2k_cbus.h
2.6/drivers/s390/cio/:
requestirq.c
2.6/drivers/scsi/:
pc980155.c pc980155.h scsi_pc98.c
2.6/drivers/scsi/qla2xxx/:
qla_os.h
2.6/drivers/serial/:
8250_hcdp.c 8250_hcdp.h serial98.c
2.6/drivers/usb/media/:
w9968cf_externaldef.h
2.6/fs/partitions/:
nec98.c nec98.h
2.6/include/asm-alpha/:
cpumask.h init.h
2.6/include/asm-arm/:
cpumask.h
2.6/include/asm-arm/arch-adifcc/:
adi_evb.h dma.h hardware.h io.h irqs.h memory.h param.h
serial.h system.h time.h timex.h uncompress.h vmalloc.h
2.6/include/asm-arm/arch-cl7500/:
time.h
2.6/include/asm-arm/arch-ebsa110/:
time.h
2.6/include/asm-arm/arch-ebsa285/:
time.h
2.6/include/asm-arm/arch-epxa10db/:
time.h
2.6/include/asm-arm/arch-iop3xx/:
time.h
2.6/include/asm-arm/arch-ixp4xx/:
time.h
2.6/include/asm-arm/arch-lh7a40x/:
ide.h time.h
2.6/include/asm-arm/arch-nexuspci/:
dma.h hardware.h io.h irqs.h memory.h param.h system.h
time.h timex.h uncompress.h vmalloc.h
2.6/include/asm-arm/arch-omap/:
time.h
2.6/include/asm-arm/arch-pxa/:
time.h
2.6/include/asm-arm/arch-rpc/:
time.h
2.6/include/asm-arm/arch-s3c2410/:
time.h
2.6/include/asm-arm/arch-sa1100/:
time.h
2.6/include/asm-arm/arch-shark/:
time.h
2.6/include/asm-arm/arch-tbox/:
dma.h hardware.h io.h irqs.h memory.h param.h serial.h
system.h time.h timex.h uncompress.h vmalloc.h
2.6/include/asm-arm/arch-versatile/:
time.h
2.6/include/asm-arm26/:
cpumask.h
2.6/include/asm-cris/:
cpumask.h
2.6/include/asm-generic/:
cpumask.h cpumask_arith.h cpumask_array.h
cpumask_const_reference.h cpumask_const_value.h
cpumask_up.h
2.6/include/asm-h8300/:
cpumask.h h8300_ne.h init.h
2.6/include/asm-i386/:
cpumask.h init.h pc9800.h pc9800_sca.h std_resources.h
upd4990a.h
2.6/include/asm-i386/mach-pc9800/:
apm.h bios_ebda.h do_timer.h io_ports.h irq_vectors.h
mach_reboot.h mach_time.h mach_timer.h mach_traps.h
mach_wakecpu.h pci-functions.h setup_arch_post.h
setup_arch_pre.h smpboot_hooks.h
2.6/include/asm-ia64/:
cpumask.h
2.6/include/asm-m68k/:
cpumask.h init.h
2.6/include/asm-m68knommu/:
cpumask.h init.h
2.6/include/asm-mips/:
cpumask.h init.h
2.6/include/asm-mips/vr41xx/:
eagle.h tb0229.h
2.6/include/asm-parisc/:
cpumask.h
2.6/include/asm-ppc/:
cpm_8260.h cpumask.h immap_8260.h ppc405_dma.h
2.6/include/asm-ppc64/:
cpumask.h init.h
2.6/include/asm-s390/:
cpumask.h init.h
2.6/include/asm-sh/:
cpumask.h init.h
2.6/include/asm-sparc/:
cpumask.h init.h
2.6/include/asm-sparc64/:
cpumask.h init.h
2.6/include/asm-um/:
cpumask.h init.h
2.6/include/asm-v850/:
cpumask.h
2.6/include/asm-x86_64/:
cpumask.h init.h
2.6/include/linux/:
802_11.h acpi_serial.h adb_mouse.h atapi.h fsfilter.h
in_systm.h isdn_lzscomp.h mpp.h netbeui.h netfilter_ddp.h
netfilter_ipx.h netfilter_x25.h upd4990a.h
2.6/net/irda/:
crc.c
2.6/net/sched/:
sch_csz.c sch_delay.c
2.6/net/xfrm/:
xfrm_output.c
2.6/scripts/:
empty.c file2alias.c mk_elfconfig.c mkconfigs mkspec
modpost.c modpost.h sumversion.c
2.6/sound/isa/cs423x/:
pc98.c pc9801_118_magic.h sound_pc9800.h
Revision Changes Path
1.10 +92 -72 2.6/Makefile
1.4 +37 -10 2.6/arch/ppc/Makefile
1.9 +32 -11 2.6/arch/ppc/defconfig
1.9 +32 -11 2.6/arch/ppc/configs/apus_defconfig
1.6 +1 -7 2.6/arch/ppc/kernel/Makefile
1.6 +24 -12 2.6/arch/ppc/kernel/entry.S
1.8 +3 -3 2.6/arch/ppc/kernel/head.S
1.8 +55 -3 2.6/arch/ppc/kernel/misc.S
1.8 +5 -4 2.6/arch/ppc/kernel/ppc_ksyms.c
1.7 +58 -4 2.6/arch/ppc/kernel/setup.c
1.4 +15 -7 2.6/arch/ppc/kernel/time.c
1.5 +1 -4 2.6/arch/ppc/mm/Makefile
1.5 +7 -1 2.6/arch/ppc/mm/init.c
1.7 +32 -0 2.6/arch/ppc/mm/pgtable.c
1.8 +17 -2 2.6/include/asm-ppc/io.h
1.6 +2 -1 2.6/include/asm-ppc/machdep.h
1.6 +37 -0 2.6/include/asm-ppc/pgtable.h
1.3 +7 -1 2.6/include/video/vga.h
|
|
From: Roman Z. <zi...@us...> - 2004-09-25 23:43:42
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: ./
Changes by: zi...@sc....(none) 04/09/25 16:43:35
Log message:
conflict fixes from import of 2.6.8.1
Modified files:
./:
Makefile
Revision Changes Path
1.11 +1 -1 2.6/Makefile
|
|
From: Roman Z. <zi...@us...> - 2005-07-30 18:53:03
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/net/ipv4/
Changes by: zi...@sc....(none) 05/07/30 11:52:54
Log message:
conflict fixes from import of 2.6.9
Modified files:
./:
Makefile
2.6/arch/ppc/:
Makefile defconfig
2.6/arch/ppc/amiga/:
config.c
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/drivers/block/:
amiflop.c
2.6/include/asm-ppc/:
io.h
2.6/include/video/:
vga.h
Removed files:
2.6/Documentation/usb/:
philips.txt
2.6/arch/alpha/lib/:
io.c
2.6/arch/arm/configs/:
iq80310_defconfig
2.6/arch/arm/mach-iop3xx/:
iop310-irq.c iop310-pci.c iq80310-irq.c iq80310-pci.c
iq80310-time.c mm.c xs80200-irq.c
2.6/arch/arm/mach-omap/:
bus.c leds-perseus2.c
2.6/arch/i386/kernel/:
vsyscall.lds
2.6/arch/i386/power/:
pmdisk.S
2.6/arch/ia64/sn/fakeprom/:
Makefile README fpmem.c fpmem.h fprom.lds fpromasm.S
fw-emu.c klgraph_init.c main.c make_textsym runsim
2.6/arch/ppc/boot/include/:
zlib.h
2.6/arch/ppc/boot/lib/:
zlib.c
2.6/arch/ppc/boot/simple/:
chrpmap.S legacy.S
2.6/arch/ppc/platforms/:
est8260_setup.c lopec_pci.c lopec_serial.h lopec_setup.c
mcpn765_serial.h mvme5100_pci.c mvme5100_serial.h
mvme5100_setup.c powerpmc250_serial.h pq2ads_setup.c
prpmc750_serial.h prpmc800_serial.h rpx8260.c
2.6/arch/ppc64/boot/:
addSystemMap.c
2.6/arch/ppc64/kernel/:
chrp_setup.c pSeries_htab.c pmac_iommu.c stab.c
2.6/arch/sparc64/lib/:
U3copy_in_user.S VIScopy.S rwlock.S splock.S
2.6/arch/um/:
dyn.lds.S main.c uml.lds.S
2.6/arch/um/drivers/:
hostaudio_user.c
2.6/arch/um/include/:
Makefile hostaudio.h
2.6/arch/um/kernel/:
mprot.h user_syms.c vmlinux.lds.S
2.6/arch/um/sys-i386/:
extable.c
2.6/arch/x86_64/kernel/:
Makefile-HEAD domain.c
2.6/drivers/char/:
busmouse.c busmouse.h
2.6/drivers/i2c/:
i2c-sensor.c
2.6/drivers/message/fusion/:
ascq_tbl.c ascq_tbl.sh isense.c isense.h scsi3.h
scsiops.c
2.6/drivers/message/i2o/:
i2o_core.c
2.6/drivers/scsi/:
dc390.h
2.6/drivers/usb/host/:
ohci-omap.h
2.6/drivers/usb/media/:
pwc-ctrl.c pwc-if.c pwc-ioctl.h pwc-misc.c
pwc-uncompress.c pwc-uncompress.h pwc.h pwc_kiara.h
pwc_nala.h pwc_timon.h
2.6/fs/xfs/:
xfs_cap.c xfs_mac.c
2.6/include/asm-arm/arch-iop3xx/:
iop310-irqs.h iop310.h iq80310.h pmon.h
2.6/include/asm-arm/arch-omap/:
bus.h
2.6/include/asm-h8300/:
softirq.h
2.6/include/asm-mips/:
mv64340.h
2.6/include/asm-ppc64/:
bootx.h
2.6/include/asm-sh64/:
smplock.h softirq.h
2.6/include/asm-um/:
module.h smplock.h
2.6/include/linux/netfilter_ipv6/:
ip6t_REJECT.h
2.6/include/sound/:
sndmagic.h
2.6/kernel/power/:
pmdisk.c
2.6/lib/zlib_inflate/:
inffixed.h
2.6/net/ipv4/:
ip_nat_dumb.c
Revision Changes Path
1.12 +217 -115 2.6/Makefile
1.5 +18 -16 2.6/arch/ppc/Makefile
1.10 +24 -12 2.6/arch/ppc/defconfig
1.4 +0 -3 2.6/arch/ppc/amiga/config.c
1.10 +24 -12 2.6/arch/ppc/configs/apus_defconfig
1.7 +1 -1 2.6/arch/ppc/kernel/Makefile
1.7 +2 -2 2.6/arch/ppc/kernel/entry.S
1.9 +8 -8 2.6/arch/ppc/kernel/head.S
1.9 +15 -18 2.6/arch/ppc/kernel/misc.S
1.9 +4 -0 2.6/arch/ppc/kernel/ppc_ksyms.c
1.8 +7 -1 2.6/arch/ppc/kernel/setup.c
1.5 +10 -33 2.6/arch/ppc/kernel/time.c
1.6 +5 -0 2.6/arch/ppc/mm/init.c
1.8 +13 -0 2.6/arch/ppc/mm/pgtable.c
1.3 +2 -14 2.6/drivers/block/amiflop.c
1.9 +73 -1 2.6/include/asm-ppc/io.h
1.4 +23 -23 2.6/include/video/vga.h
|
|
From: Roman Z. <zi...@us...> - 2005-07-30 20:49:32
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.6
Repository: 2.6/include/pcmcia/
Changes by: zi...@sc....(none) 05/07/30 13:49:26
Log message:
conflict fixes from import of 2.6.10
Modified files:
./:
Makefile
2.6/arch/ppc/kernel/:
Makefile misc.S ppc_ksyms.c setup.c time.c
2.6/arch/ppc/mm/:
pgtable.c
2.6/drivers/block/:
amiflop.c
2.6/include/asm-m68k/:
bootinfo.h
2.6/include/asm-ppc/:
io.h machdep.h pgtable.h
Removed files:
2.6/Documentation/:
digiboard.txt mkdev.ida
2.6/Documentation/DocBook/:
mousedrivers.tmpl
2.6/Documentation/dvb/:
firmware.txt
2.6/Documentation/isdn/:
README.eicon
2.6/Documentation/sound/oss/:
ChangeLog.awe ChangeLog.multisound
2.6/arch/arm/:
defconfig
2.6/arch/arm/boot/compressed/:
hw-bse.c
2.6/arch/arm/configs/:
adsbitsy_defconfig brutus_defconfig empeg_defconfig
flexanet_defconfig freebird_defconfig
freebird_new_defconfig graphicsclient_defconfig
graphicsmaster_defconfig huw_webpanel_defconfig
pangolin_defconfig pfs168_mqtft_defconfig
pfs168_mqvga_defconfig pfs168_sastn_defconfig
pfs168_satft_defconfig sherman_defconfig stork_defconfig
system3_defconfig trizeps_defconfig
2.6/arch/arm/lib/:
io-readsl-armv3.S io-readsl-armv4.S
2.6/arch/arm/mach-footbridge/:
arch.c irq.c mm.c
2.6/arch/arm/mach-iop3xx/:
arch.c iop321-mm.c iop331-mm.c mm-321.c
2.6/arch/arm/mach-omap/:
clocks.c
2.6/arch/arm/mach-sa1100/:
adsbitsy.c brutus.c empeg.c flexanet.c freebird.c
graphicsclient.c graphicsmaster.c huw_webpanel.c itsy.c
leds-adsbitsy.c leds-brutus.c leds-flexanet.c
leds-graphicsclient.c leds-graphicsmaster.c leds-pfs168.c
leds-system3.c nanoengine.c omnimeter.c pangolin.c
pfs168.c sherman.c stork.c system3.c trizeps.c xp860.c
yopy.c
2.6/arch/cris/arch-v10/drivers/:
ethernet.c ide.c serial.c serial.h
2.6/arch/h8300/platform/h8300h/aki3068net/:
ram.ld
2.6/arch/h8300/platform/h8300h/generic/:
ram.ld rom.ld
2.6/arch/h8300/platform/h8300h/h8max/:
ram.ld
2.6/arch/h8300/platform/h8s/edosk2674/:
ram.ld rom.ld
2.6/arch/h8300/platform/h8s/generic/:
ram.ld rom.ld
2.6/arch/i386/kernel/cpu/cpufreq/:
acpi.c
2.6/arch/i386/pci/:
changelog
2.6/arch/ia64/configs/:
generic_defconfig
2.6/arch/ia64/sn/io/:
Makefile cdl.c io.c snia_if.c xswitch.c
2.6/arch/ia64/sn/io/drivers/:
Makefile ioconfig_bus.c
2.6/arch/ia64/sn/io/hwgfs/:
Makefile hcl.c hcl_util.c interface.c labelcl.c ramfs.c
2.6/arch/ia64/sn/io/machvec/:
Makefile iomv.c pci.c pci_bus_cvlink.c pci_dma.c
2.6/arch/ia64/sn/io/platform_init/:
Makefile sgi_io_init.c
2.6/arch/ia64/sn/io/sn2/:
Makefile bte_error.c geo_op.c klconflib.c klgraph.c
l1_command.c ml_SN_init.c ml_SN_intr.c ml_iograph.c
module.c pciio.c pic.c shub.c shub_intr.c shuberror.c
shubio.c xbow.c xtalk.c
2.6/arch/ia64/sn/io/sn2/pcibr/:
Makefile pcibr_ate.c pcibr_config.c pcibr_dvr.c
pcibr_error.c pcibr_hints.c pcibr_intr.c pcibr_reg.c
pcibr_rrb.c pcibr_slot.c
2.6/arch/ia64/sn/kernel/:
probe.c
2.6/arch/m68knommu/platform/5282/:
Makefile config.c pit.c
2.6/arch/m68knommu/platform/5282/MOTOROLA/:
crt0_ram.S
2.6/arch/m68knommu/platform/5282/senTec/:
crt0_ram.S
2.6/arch/mips/baget/:
Makefile baget.c bagetIRQ.S balo.c balo_supp.S irq.c
ld.script.balo print.c reset.c setup.c time.c
2.6/arch/mips/baget/prom/:
Makefile init.c
2.6/arch/mips/configs/:
bosporus_defconfig mirage_defconfig mtx1_defconfig
pb1000_defconfig xxs1500_defconfig
2.6/arch/mips/ddb5xxx/common/:
irq.c
2.6/arch/mips/hp-lj/:
Makefile asic.c gdb_hook.c init.c int-handler.S irq.c
setup.c utils.c utils.h
2.6/arch/mips/mm/:
tlbex64-r4k.S
2.6/arch/mips/pci/:
fixup-lasat.c pci-hplj.c
2.6/arch/mips/ramdisk/:
Makefile ld.script
2.6/arch/parisc/kernel/:
head64.S
2.6/arch/ppc/8xx_io/:
uart.c
2.6/arch/ppc64/kernel/:
iSeries_IoMmTable.c iSeries_IoMmTable.h mf_proc.c
open_pic.c open_pic.h open_pic_defs.h open_pic_u3.c
2.6/arch/sh/tools/:
machgen.sh
2.6/arch/um/kernel/skas/:
exec_user.c
2.6/arch/um/kernel/skas/include/:
mmu.h mode.h mode_kern.h uaccess.h
2.6/arch/um/kernel/tt/include/:
mmu.h mode.h mode_kern.h uaccess.h
2.6/drivers/acpi/:
acpi_ksyms.c
2.6/drivers/char/:
README.computone README.cyclomY README.epca README.scc
2.6/drivers/ide/legacy/:
pdc4030.c pdc4030.h
2.6/drivers/ide/pci/:
hpt34x.h
2.6/drivers/media/dvb/dvb-core/:
Makefile.lib dvb_functions.c dvb_functions.h dvb_i2c.c
dvb_i2c.h dvb_ksyms.c
2.6/drivers/media/dvb/frontends/:
alps_tdlb7.c alps_tdmb7.c dst-bt878.h dst.c
grundig_29504-401.c grundig_29504-491.c sp887x_firm.h
2.6/drivers/mtd/:
mtdblock.h
2.6/drivers/mtd/maps/:
integrator-flash-v24.c
2.6/drivers/pci/hotplug/:
pciehp_sysfs.c
2.6/drivers/pcmcia/:
sa1100_adsbitsy.c sa1100_flexanet.c sa1100_freebird.c
sa1100_graphicsclient.c sa1100_graphicsmaster.c
sa1100_pangolin.c sa1100_pfs168.c sa1100_stork.c
sa1100_system3.c sa1100_trizeps.c sa1100_xp860.c
sa1100_yopy.c
2.6/drivers/scsi/:
dmx3191d.h i60uscsi.c i91uscsi.c i91uscsi.h ini9100u.c
ini9100u.h inia100.c inia100.h scsiiom.c
2.6/drivers/usb/host/:
hc_simple.c hc_simple.h hc_sl811.c hc_sl811.h
hc_sl811_rh.c
2.6/drivers/usb/misc/:
speedtch.c
2.6/fs/devpts/:
xattr.c xattr.h
2.6/fs/lockd/:
lockd_syms.c
2.6/include/asm-arm/arch-cl7500/:
serial.h
2.6/include/asm-arm/arch-ebsa110/:
serial.h
2.6/include/asm-arm/arch-ebsa285/:
serial.h
2.6/include/asm-arm/arch-epxa10db/:
serial.h
2.6/include/asm-arm/arch-h720x/:
serial.h
2.6/include/asm-arm/arch-imx/:
serial.h
2.6/include/asm-arm/arch-integrator/:
serial.h time.h
2.6/include/asm-arm/arch-iop3xx/:
serial.h
2.6/include/asm-arm/arch-ixp2000/:
serial.h
2.6/include/asm-arm/arch-ixp4xx/:
serial.h
2.6/include/asm-arm/arch-lh7a40x/:
serial.h
2.6/include/asm-arm/arch-omap/:
omap1610.h omap5912.h serial.h
2.6/include/asm-arm/arch-pxa/:
serial.h
2.6/include/asm-arm/arch-rpc/:
serial.h
2.6/include/asm-arm/arch-s3c2410/:
serial.h
2.6/include/asm-arm/arch-sa1100/:
adsbitsy.h flexanet.h freebird.h graphicsclient.h
graphicsmaster.h huw_webpanel.h itsy.h mftb2.h
omnimeter.h pangolin.h pfs168.h pleb.h serial.h stork.h
system3.h trizeps.h yopy.h
2.6/include/asm-arm/arch-shark/:
serial.h
2.6/include/asm-arm/arch-versatile/:
serial.h
2.6/include/asm-arm26/:
linux_logo.h
2.6/include/asm-h8300/:
linux_logo.h
2.6/include/asm-ia64/sn/:
cdl.h dmamap.h driver.h hcl.h hcl_util.h hwgfs.h
ifconfig_net.h ioc4.h ioconfig_bus.h ioerror.h
ioerror_handling.h iograph.h kldir.h labelcl.h pio.h
prio.h sgi.h slotnum.h sn_private.h vector.h
2.6/include/asm-ia64/sn/ksys/:
elsc.h l1.h
2.6/include/asm-ia64/sn/pci/:
bridge.h pci_bus_cvlink.h pci_defs.h pcibr.h
pcibr_private.h pciio.h pciio_private.h pic.h
2.6/include/asm-ia64/sn/sn2/:
addrs.h arch.h geo.h intr.h io.h shub.h shub_md.h
shub_mmr.h shub_mmr_t.h shubio.h slotnum.h sn_private.h
2.6/include/asm-ia64/sn/xtalk/:
xbow.h xbow_info.h xswitch.h xtalk.h xtalk_private.h
xtalkaddrs.h xwidget.h
2.6/include/asm-m68knommu/:
m5282sim.h shglcore.h shglports.h
2.6/include/asm-mips/:
pci_channel.h
2.6/include/asm-mips/baget/:
baget.h vac.h vic.h
2.6/include/asm-parisc/:
som.h
2.6/include/pcmcia/:
ftl.h memory.h
Revision Changes Path
1.13 +46 -21 2.6/Makefile
1.8 +1 -1 2.6/arch/ppc/kernel/Makefile
1.10 +3 -0 2.6/arch/ppc/kernel/misc.S
1.10 +1 -11 2.6/arch/ppc/kernel/ppc_ksyms.c
1.9 +4 -0 2.6/arch/ppc/kernel/setup.c
1.6 +3 -0 2.6/arch/ppc/kernel/time.c
1.9 +6 -6 2.6/arch/ppc/mm/pgtable.c
1.4 +2 -2 2.6/drivers/block/amiflop.c
1.4 +7 -0 2.6/include/asm-m68k/bootinfo.h
1.10 +197 -143 2.6/include/asm-ppc/io.h
1.7 +1 -0 2.6/include/asm-ppc/machdep.h
1.7 +2 -1 2.6/include/asm-ppc/pgtable.h
|
|
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
|
|
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
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X