Menu
▾
▴
CVS Update: 2.3 (branch: trunk)
|
From: Roman Z. <zi...@us...> - 2003-08-30 23:06:58
|
CVSROOT: /cvsroot/linux-apus
Module name: 2.3
Repository: 2.3/net/bluetooth/bnep/
Changes by: zippel@sc8-pr-cvs1. 03/08/30 16:06:57
Log message:
conflict fixes from import linuxppc (2.4.22)
Modified files:
./:
Makefile
2.3/Documentation/:
Configure.help
2.3/arch/ppc/:
Makefile config.in defconfig
2.3/arch/ppc/amiga/:
config.c
2.3/arch/ppc/configs/:
apus_defconfig
2.3/arch/ppc/kernel/:
head.S ppc-stub.c setup.c time.c
2.3/arch/ppc/mm/:
pgtable.c
2.3/arch/ppc/platforms/:
apus_pci.c
2.3/drivers/char/:
Config.in
2.3/drivers/ide/:
ide-probe.c
2.3/drivers/net/:
Makefile
2.3/drivers/scsi/:
Config.in Makefile
2.3/drivers/video/:
Config.in fbcon.c fbmem.c
2.3/fs/:
Config.in Makefile buffer.c
2.3/include/asm-ppc/:
io.h
2.3/include/linux/:
fs.h
Added files:
2.3/arch/i386/kernel/:
acpi.c
2.3/drivers/acpi/:
ec.c power.c tables.c
2.3/drivers/ide/:
ide-sibyte.c
Removed files:
2.3/arch/arm/boot/compressed/:
hw-bse.c
2.3/arch/arm/mach-epxa10db/:
Makefile arch.c dma.c irq.c mm.c time.c
2.3/arch/arm/mach-sa1100/:
pcipool.c pcipool.h sleep.h
2.3/arch/ia64/sn/fakeprom/:
runsim
2.3/arch/ia64/sn/io/:
alenlist.c ate_utils.c eeprom.c efi-rtc.c hcl.c
hcl_util.c hubdev.c hubspc.c ifconfig_bus.c
ifconfig_net.c invent.c klconflib.c klgraph.c
klgraph_hack.c l1.c l1_command.c labelcl.c ml_SN_init.c
ml_iograph.c module.c pci.c pci_bus_cvlink.c pci_dma.c
pciba.c pciio.c sgi_io_init.c stubs.c xbow.c xtalk.c
2.3/arch/ia64/sn/io/sn1/:
Makefile eeprom.c efi-rtc.c hub_intr.c hubcounters.c
huberror.c ip37.c klconflib.c klgraph.c l1.c l1_command.c
mem_refcnt.c ml_SN_init.c ml_SN_intr.c ml_iograph.c
module.c pci_bus_cvlink.c pcibr.c pciio.c sgi_io_init.c
xbow.c xtalk.c
2.3/arch/ia64/sn/io/sn2/:
efi-rtc.c l1.c pci_bus_cvlink.c sgi_io_init.c
2.3/arch/ia64/sn/io/sn2/pcibr/:
pcibr_idbg.c
2.3/arch/ia64/sn/kernel/:
bte_regr_test.c iomv.c llsc4.c llsc4.h misctest.c
sn_asm.S
2.3/arch/ia64/sn/kernel/sn1/:
Makefile cache.c error.c iomv.c sn1_smp.c synergy.c
2.3/arch/ia64/sn/kernel/sn2/:
iomv.c
2.3/arch/ia64/sn/tools/:
make_textsym
2.3/arch/mips/algor/:
README
2.3/arch/mips/arc/:
console.c
2.3/arch/mips/au1000/common/:
serial.c
2.3/arch/mips/au1000/pb1000/:
pci_fixup.c pci_ops.c setup.c
2.3/arch/mips/au1000/pb1100/:
pci_fixup.c pci_ops.c setup.c
2.3/arch/mips/au1000/pb1500/:
pci_fixup.c pci_ops.c setup.c
2.3/arch/mips/baget/:
vacserial.c wbflush.c
2.3/arch/mips/ddb5074/:
Makefile int-handler.S irq.c nile4.c pci.c prom.c setup.c
time.c
2.3/arch/mips/dec/prom/:
prom.h
2.3/arch/mips/galileo-boards/ev64120/:
Makefile cntmr.c dma.c i2o.c int-handler.S irq-handler.c
irq.c pci_bios.c promcon.c reset.c serialGT.c setup.c
2.3/arch/mips/galileo-boards/generic/:
Makefile reset.c
2.3/arch/mips/gt64120/common/:
gt_irq.c
2.3/arch/mips/gt64120/momenco_ocelot/:
pci.c
2.3/arch/mips/hp-lj/:
pci-dma.c
2.3/arch/mips/ite-boards/generic/:
it8172_rtc.c
2.3/arch/mips/kernel/:
ioport.c old-irq.c pci.c pci_auto.c vm86.c
2.3/arch/mips/lib/:
kbd-no.c
2.3/arch/mips/mm/:
c-andes.c c-mips32.c c-r5432.c c-rm7k.c c-tx49.c
pg-andes.S pg-mips32.c pg-r5432.c pg-rm7k.c r5k-sc.c
umap.c
2.3/arch/mips/sgi-ip22/:
ip22-gio.c ip22-sc.c ip22-system.c
2.3/arch/mips/sgi-ip27/:
ip27-rtc.c
2.3/arch/mips/sgi-ip32/:
Makefile crime.c ip32-berr.c ip32-irq-glue.S ip32-irq.c
ip32-pci.c ip32-reset.c ip32-rtc.c ip32-setup.c
ip32-timer.c
2.3/arch/mips/sibyte/cfe/:
cfe_xiocb.h
2.3/arch/mips/sibyte/sb1/:
Makefile cache_err_handler.S cache_error.c
2.3/arch/mips/sibyte/sb1250/:
bcm1250_tbprof.h lib_hssubr.S lib_hssubr.h
2.3/arch/mips64/:
defconfig-ip32
2.3/arch/mips64/kernel/:
binfmt_elf32.c
2.3/arch/mips64/lib/:
kbd-no.c
2.3/arch/mips64/mm/:
andes.c c-mips64.c pg-mips64.c r4xx0.c r5k-sc.c umap.c
2.3/arch/ppc/mm/:
4xx_tlb.c 4xx_tlb.h
2.3/arch/x86_64/kernel/:
acpitable.c
2.3/drivers/acorn/scsi/:
arxescsi.h
2.3/drivers/acpi/:
driver.c os.c
2.3/drivers/acpi/debugger/:
Makefile dbcmds.c dbdisasm.c dbdisply.c dbexec.c
dbfileio.c dbhistry.c dbinput.c dbstats.c dbutils.c
dbxface.c
2.3/drivers/acpi/include/:
acconfig.h acdebug.h acdispat.h acevents.h acexcep.h
acglobal.h achware.h acinterp.h aclocal.h acmacros.h
acnamesp.h acobject.h acoutput.h acparser.h acpi.h
acpiosxf.h acpixf.h acresrc.h acstruct.h actables.h
actbl.h actbl1.h actbl2.h actbl71.h actypes.h acutils.h
amlcode.h
2.3/drivers/acpi/include/platform/:
acenv.h acgcc.h aclinux.h
2.3/drivers/acpi/kdb/:
README.txt kdbm_acpi.c
2.3/drivers/acpi/ospm/:
Makefile
2.3/drivers/acpi/ospm/ac_adapter/:
Makefile ac.c ac_osl.c
2.3/drivers/acpi/ospm/battery/:
Makefile bt.c bt_osl.c
2.3/drivers/acpi/ospm/busmgr/:
Makefile bm.c bm_osl.c bmdriver.c bmnotify.c bmpm.c
bmpower.c bmrequest.c bmsearch.c bmutils.c
2.3/drivers/acpi/ospm/button/:
Makefile bn.c bn_osl.c
2.3/drivers/acpi/ospm/ec/:
Makefile ec_osl.c ecgpe.c ecmain.c ecspace.c ectransx.c
2.3/drivers/acpi/ospm/include/:
ac.h bm.h bmpower.h bn.h bt.h ec.h pr.h sm.h tz.h
2.3/drivers/acpi/ospm/processor/:
Makefile pr.c pr_osl.c prperf.c prpower.c
2.3/drivers/acpi/ospm/system/:
Makefile sm.c sm_osl.c
2.3/drivers/acpi/ospm/thermal/:
Makefile tz.c tz_osl.c tzpolicy.c
2.3/drivers/message/fusion/lsi/:
mpi_tool.h
2.3/drivers/net/:
bonding.c
2.3/drivers/scsi/aic79xx/:
CHANGELOG Config.in Makefile aic79xx.h aic79xx.reg
aic79xx.seq aic79xx_core.c aic79xx_inline.h aic79xx_osm.c
aic79xx_osm.h aic79xx_osm_pci.c aic79xx_pci.c
aic79xx_proc.c aic79xx_reg.h aic79xx_reg_print.c
aic79xx_seq.h aiclib.c aiclib.h cam.h queue.h scsi_iu.h
scsi_message.h
2.3/drivers/scsi/aic79xx/aicasm/:
Makefile aicasm.c aicasm.h aicasm_gram.y
aicasm_insformat.h aicasm_macro_gram.y
aicasm_macro_scan.l aicasm_scan.l aicasm_symbol.c
aicasm_symbol.h
2.3/drivers/scsi/aic7xxx/:
aic7xxx_host.h
2.3/drivers/sgi/:
Config.in Makefile
2.3/drivers/sgi/char/:
Makefile ds1286.c gconsole.h graphics.c graphics.h
newport.c rrm.c sgicons.c sgiserial.c sgiserial.h shmiq.c
streamable.c usema.c usema.h
2.3/fs/:
noquot.c
2.3/fs/jffs2/:
crc32.c crc32.h
2.3/include/asm-arm/arch-epxa10db/:
dma.h ether00.h excalibur.h hardware.h int_ctrl00.h io.h
irq.h irqs.h memory.h mode_ctrl00.h param.h platform.h
pld_conf00.h serial.h system.h tdkphy.h time.h timer00.h
timex.h uart00.h uncompress.h vmalloc.h
2.3/include/asm-arm/proc-armo/:
uncompress.h
2.3/include/asm-arm/proc-armv/:
uncompress.h
2.3/include/asm-ia64/:
machvec_sn1.h
2.3/include/asm-ia64/sn/:
ate_utils.h bte_copy.h eeprom.h gda.h hack.h
hires_clock.h idle.h intr_public.h mca.h nic.h
sn_pio_sync.h snconfig.h systeminfo.h
2.3/include/asm-ia64/sn/sn1/:
addrs.h arch.h bedrock.h hubdev.h hubio.h hubio_next.h
hublb.h hublb_next.h hubmd.h hubmd_next.h hubni.h
hubni_next.h hubpi.h hubpi_next.h hubspc.h hubstat.h
hubxb.h hubxb_next.h hwcntrs.h intr.h intr_public.h
ip27config.h mem_refcnt.h mmzone_sn1.h slotnum.h
sn_private.h synergy.h
2.3/include/asm-ia64/sn/sn2/:
mmzone_sn2.h
2.3/include/asm-mips/:
gt64120.h mips32_cache.h rrm.h umap.h
2.3/include/asm-mips/galileo-boards/:
ev64120.h ev64120int.h ev96100.h
2.3/include/asm-mips/galileo-boards/evb64120A/:
cntmr.h core.h dma.h eeprom_param.h flashdrv.h i2o.h
memory.h pci.h
2.3/include/asm-mips/sgi/:
sgigio.h sgihpc.h sgimc.h sgint23.h
2.3/include/asm-mips/sibyte/:
sb1250_prof.h swarm_ide.h
2.3/include/asm-mips64/:
gt64120.h mips64_cache.h r10kcache.h r10kcacheops.h
r4kcacheops.h rrm.h
2.3/include/asm-mips64/ip32/:
crime.h io.h ip32_ints.h mace.h machine.h
2.3/include/asm-mips64/mips-boards/:
gt64120.h
2.3/include/asm-mips64/sgi/:
sgigio.h sgihpc.h sgimc.h sgint23.h
2.3/include/asm-mips64/sibyte/:
sb1250_prof.h swarm_ide.h
2.3/include/asm-ppc/:
ppc4xx.h walnut.h
2.3/net/:
README
2.3/net/bluetooth/bnep/:
crc32.c crc32.h
Revision Changes Path
1.36 +10 -5 2.3/Makefile
1.28 +979 -141 2.3/Documentation/Configure.help
1.15 +3 -5 2.3/arch/ppc/Makefile
1.35 +57 -30 2.3/arch/ppc/config.in
1.26 +11 -1 2.3/arch/ppc/defconfig
1.19 +5 -7 2.3/arch/ppc/amiga/config.c
1.21 +11 -1 2.3/arch/ppc/configs/apus_defconfig
1.30 +11 -11 2.3/arch/ppc/kernel/head.S
1.9 +4 -4 2.3/arch/ppc/kernel/ppc-stub.c
1.27 +13 -16 2.3/arch/ppc/kernel/setup.c
1.21 +7 -8 2.3/arch/ppc/kernel/time.c
1.7 +10 -10 2.3/arch/ppc/mm/pgtable.c
1.3 +3 -3 2.3/arch/ppc/platforms/apus_pci.c
1.10 +4 -1 2.3/drivers/char/Config.in
1.10 +1 -0 2.3/drivers/ide/ide-probe.c
1.16 +10 -2 2.3/drivers/net/Makefile
1.16 +4 -3 2.3/drivers/scsi/Config.in
1.12 +2 -2 2.3/drivers/scsi/Makefile
1.11 +2 -2 2.3/drivers/video/Config.in
1.5 +17 -17 2.3/drivers/video/fbcon.c
1.17 +5 -0 2.3/drivers/video/fbmem.c
1.3 +6 -1 2.3/fs/Config.in
1.5 +5 -7 2.3/fs/Makefile
1.6 +73 -30 2.3/fs/buffer.c
1.16 +21 -19 2.3/include/asm-ppc/io.h
1.8 +47 -25 2.3/include/linux/fs.h
|
