CVS Update: 2.3 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/include/asm-ppc/
Changes by:	zippel@usw-pr-cvs1.	02/01/09 15:47:52

Log message:
  conflict fixes from import bitkeeper (2.4.17)

Modified files:
      ./:
        Makefile 
      2.3/arch/ppc/:
        config.in 
      2.3/arch/ppc/kernel/:
        head.S irq.c ppc_ksyms.c setup.c time.c 
      2.3/arch/ppc/mm/:
        init.c 
      2.3/drivers/char/:
        mem.c 
      2.3/drivers/ide/:
        ide.c 
      2.3/drivers/net/:
        Makefile 
      2.3/drivers/parport/:
        ieee1284_ops.c 
      2.3/drivers/scsi/:
        Config.in Makefile 
      2.3/drivers/sound/dmasound/:
        dmasound_core.c dmasound_paula.c 
      2.3/drivers/video/:
        fbcon.c fbmem.c 
Removed files:
      2.3/Documentation/filesystems/devfs/:
        rc.devfs 
      2.3/Documentation/networking/:
        tulip.txt 
      2.3/arch/ppc/kernel/:
        feature.c 
      2.3/drivers/ieee1394/:
        ieee1394_syms.c 
      2.3/drivers/isdn/hysdn/:
        hysdn_procfs.c 
      2.3/drivers/net/pcmcia/:
        ax8390.h 
      2.3/fs/ext3/:
        acl.c 
      2.3/include/asm-ppc/:
        feature.h 
  
  Revision      Changes    Path
  1.32          +1 -1      2.3/Makefile
  1.25          +8 -3      2.3/arch/ppc/config.in
  1.26          +54 -1     2.3/arch/ppc/kernel/head.S
  1.14          +22 -14    2.3/arch/ppc/kernel/irq.c
  1.30          +11 -12    2.3/arch/ppc/kernel/ppc_ksyms.c
  1.23          +9 -4      2.3/arch/ppc/kernel/setup.c
  1.16          +2 -2      2.3/arch/ppc/kernel/time.c
  1.25          +31 -7     2.3/arch/ppc/mm/init.c
  1.11          +41 -5     2.3/drivers/char/mem.c
  1.6           +4 -2      2.3/drivers/ide/ide.c
  1.12          +1 -1      2.3/drivers/net/Makefile
  1.5           +29 -15    2.3/drivers/parport/ieee1284_ops.c
  1.12          +3 -0      2.3/drivers/scsi/Config.in
  1.8           +4 -0      2.3/drivers/scsi/Makefile
  1.6           +191 -112  2.3/drivers/sound/dmasound/dmasound_core.c
  1.6           +6 -6      2.3/drivers/sound/dmasound/dmasound_paula.c
  1.3           +50 -0     2.3/drivers/video/fbcon.c
  1.13          +2 -0      2.3/drivers/video/fbmem.c