CVS Update: 2.6 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.6
Repository:	2.6/arch/ppc/kernel/
Changes by:	zi...@sc....(none)	05/08/03 16:42:52

Log message:
  fix merge error

Modified files:
      2.6/arch/ppc/kernel/:
        setup.c 
  
  Revision      Changes    Path
  1.12          +0 -3      2.6/arch/ppc/kernel/setup.c