CVS Update: 2.3 (branch: trunk)

[Roman Z. <zi...@us...>]

CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/mm/
Changes by:	zippel@usw-pr-cvs1.	01/06/09 17:17:28

Log message:
  conflict fixes from import bitkeeper (2.4.5)

Modified files:
      ./:
        Makefile 
      2.3/Documentation/:
        Configure.help 
      2.3/arch/ppc/:
        Makefile defconfig 
      2.3/arch/ppc/configs/:
        apus_defconfig 
      2.3/arch/ppc/kernel/:
        apus_setup.c head.S irq.c pci.c ppc-stub.c ppc_ksyms.c 
        setup.c time.c 
      2.3/arch/ppc/mm/:
        init.c 
      2.3/drivers/char/:
        mem.c misc.c 
      2.3/include/asm-ppc/:
        amigaints.h bootinfo.h io.h mpc8xx.h pgtable.h ppc4xx.h 
      2.3/mm/:
        page_alloc.c 
Added files:
      2.3/Documentation/:
        logo.gif 
Removed files:
      2.3/arch/ppc/boot/:
        head.S iso_font.h kbd.c misc.c mkprep.c mksimage.c 
        ns16550.c ns16550.h of1275.c of1275.h offset sioffset 
        sisize size vreset.c 
      2.3/arch/ppc/chrpboot/:
        Makefile addnote.c crt0.S main.c misc.S mknote.c 
        no_initrd.c piggyback.c start.c 
      2.3/arch/ppc/coffboot/:
        Makefile chrpmain.c coffcrt0.S coffmain.c crt0.S dummy.c 
        hack-coff.c ld.script misc.S mknote.c no_initrd.c 
        nonstdio.h piggyback.c rs6000.h start.c string.S zlib.c 
        zlib.h 
      2.3/arch/ppc/mbxboot/:
        Makefile embed_config.c gzimage.c head.S head_8260.S 
        iic.c m8260_tty.c m8xx_tty.c misc.c offset pci.c 
        qspan_pci.c rdimage.c size 
      2.3/arch/ppc/treeboot/:
        Makefile crt0.S elf.pl irSect.c irSect.h ld.script main.c 
        misc.S mkevimg mkirimg 
      2.3/include/asm-sparc64/:
        semaphore-helper.h 
      2.3/include/linux/:
        compiler.h 
  
  Revision      Changes    Path
  1.22          +8 -7      2.3/Makefile
  1.14          +48 -2     2.3/Documentation/Configure.help
  1.6           +3 -52     2.3/arch/ppc/Makefile
  1.9           +2 -1      2.3/arch/ppc/defconfig
  1.7           +2 -1      2.3/arch/ppc/configs/apus_defconfig
  1.15          +1 -1      2.3/arch/ppc/kernel/apus_setup.c
  1.19          +8 -7      2.3/arch/ppc/kernel/head.S
  1.8           +1 -1      2.3/arch/ppc/kernel/irq.c
  1.11          +5 -5      2.3/arch/ppc/kernel/pci.c
  1.6           +1 -1      2.3/arch/ppc/kernel/ppc-stub.c
  1.20          +3 -7      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.14          +90 -40    2.3/arch/ppc/kernel/setup.c
  1.11          +1 -1      2.3/arch/ppc/kernel/time.c
  1.18          +1 -1      2.3/arch/ppc/mm/init.c
  1.6           +0 -6      2.3/drivers/char/mem.c
  1.4           +0 -4      2.3/drivers/char/misc.c
  1.5           +1 -1      2.3/include/asm-ppc/amigaints.h
  1.5           +23 -3     2.3/include/asm-ppc/bootinfo.h
  1.8           +1 -1      2.3/include/asm-ppc/io.h
  1.3           +1 -1      2.3/include/asm-ppc/mpc8xx.h
  1.8           +1 -1      2.3/include/asm-ppc/pgtable.h
  1.3           +1 -1      2.3/include/asm-ppc/ppc4xx.h
  1.14          +25 -32    2.3/mm/page_alloc.c