usagi/kernel/linux25/arch/x86_64/oprofile Makefile usagi/kernel/linux25/drivers/i2c/chips Kconfig Makefile adm1021.c lm75.c usagi/kernel/linux25/drivers/ide ide-probe.c usagi/kernel/linux25/drivers/pcmcia i82365.c

miyazawa    2003/05/09 12:44:44 JST

  Modified files:
    kernel/linux25/arch/x86_64/oprofile Makefile 
    kernel/linux25/drivers/i2c/chips Kconfig Makefile adm1021.c 
                                     lm75.c 
    kernel/linux25/drivers/ide ide-probe.c 
    kernel/linux25/drivers/pcmcia i82365.c 
  Log:
  sync with linux-2.5.69; conflicts resolved
  
  Revision  Changes    Path
  1.2       +4 -5      usagi/kernel/linux25/arch/x86_64/oprofile/Makefile
  1.5       +12 -2     usagi/kernel/linux25/drivers/i2c/chips/Kconfig
  1.3       +1 -0      usagi/kernel/linux25/drivers/i2c/chips/Makefile
  1.6       +4 -126    usagi/kernel/linux25/drivers/i2c/chips/adm1021.c
  1.6       +4 -4      usagi/kernel/linux25/drivers/i2c/chips/lm75.c
  1.24      +1 -1      usagi/kernel/linux25/drivers/ide/ide-probe.c
  1.6       +19 -13    usagi/kernel/linux25/drivers/pcmcia/i82365.c