CVS Update: 2.3 (branch: trunk)

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

CVSROOT:	/cvsroot/linux-apus
Module name:	2.3
Repository:	2.3/drivers/ide/
Changes by:	zippel@usw-pr-cvs1.	01/11/27 16:30:38

Log message:
  conflict fixes from import bitkeeper (2.4.16)

Modified files:
      ./:
        Makefile 
      2.3/arch/ppc/kernel/:
        time.c 
      2.3/drivers/ide/:
        ide-probe.c 
  
  Revision      Changes    Path
  1.31          +2 -2      2.3/Makefile
  1.15          +11 -55    2.3/arch/ppc/kernel/time.c
  1.5           +1 -1      2.3/drivers/ide/ide-probe.c