Merge ../linux-2.6
Paul Mackerras [Tue, 8 Nov 2005 00:14:20 +0000 (11:14 +1100)]
1  2 
arch/powerpc/kernel/time.c
arch/powerpc/mm/hash_utils_64.c

Simple merge
Simple merge