Automatic merge of /spare/repo/netdev-2.6 branch 8139too-iomap
[linux-2.6] / arch / ppc / platforms / chrp_time.c
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