Automatic merge of ../scsi-misc-2.6-old/
[linux-2.6] / arch / ppc / kernel / time.c
2005-04-16  Benoit Boissinot[PATCH] ppc32: fix compilation error in arch/ppc/kernel...
2005-04-16  Giovambattista Pulcini[PATCH] ppc32: Fix a problem with NTP on !(chrp||gemini)
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2