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/08/14 17:43:50

Log message:
  conflict fixes from import bitkeeper (2.4.8)

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/:
        pci.c ppc_ksyms.c setup.c 
      2.3/drivers/char/:
        mem.c 
      2.3/drivers/video/:
        Config.in 
      2.3/fs/affs/:
        inode.c 
      2.3/mm/:
        page_alloc.c 
Added files:
      2.3/drivers/sound/emu10k1/:
        efxmgr.c 
Removed files:
      2.3/arch/ia64/kernel/:
        irq_sapic.c 
      2.3/arch/s390/tools/dasdfmt/:
        Makefile dasdfmt.8 dasdfmt.c 
      2.3/arch/s390/tools/silo/:
        Makefile cfg.c cfg.h silo.c silo.conf 
      2.3/arch/s390x/tools/dasdfmt/:
        Makefile dasdfmt.8 dasdfmt.c 
      2.3/arch/s390x/tools/silo/:
        Makefile cfg.c cfg.h silo.c silo.conf 
      2.3/drivers/char/drm/:
        agpsupport.c auth.c bufs.c context.c ctxbitmap.c dma.c 
        drawable.c fops.c i810_bufs.c i810_context.c init.c 
        ioctl.c lists.c lock.c memory.c mga_bufs.c mga_context.c 
        proc.c r128_bufs.c r128_context.c radeon_bufs.c 
        radeon_context.c tdfx_context.c tdfx_drv.h vm.c 
      2.3/drivers/sound/emu10k1/:
        emu_wrapper.h 
      2.3/drivers/video/:
        aty.h atyfb.c 
  
  Revision      Changes    Path
  1.25          +1 -1      2.3/Makefile
  1.17          +65 -0     2.3/Documentation/Configure.help
  1.9           +2 -2      2.3/arch/ppc/Makefile
  1.12          +2 -0      2.3/arch/ppc/defconfig
  1.10          +2 -0      2.3/arch/ppc/configs/apus_defconfig
  1.13          +13 -1     2.3/arch/ppc/kernel/pci.c
  1.23          +1 -2      2.3/arch/ppc/kernel/ppc_ksyms.c
  1.16          +1 -2      2.3/arch/ppc/kernel/setup.c
  1.8           +3 -1      2.3/drivers/char/mem.c
  1.5           +10 -0     2.3/drivers/video/Config.in
  1.11          +6 -6      2.3/fs/affs/inode.c
  1.16          +44 -26    2.3/mm/page_alloc.c