Menu
▾
▴
CVS Update: 2.6 (branch: trunk)
|
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
|
