Merge ../linux-2.6

author Paul Mackerras <paulus@samba.org>

Tue, 8 Nov 2005 00:14:20 +0000 (11:14 +1100)

committer Paul Mackerras <paulus@samba.org>

Tue, 8 Nov 2005 00:14:20 +0000 (11:14 +1100)
author Paul Mackerras <paulus@samba.org>
Tue, 8 Nov 2005 00:14:20 +0000 (11:14 +1100)
committer Paul Mackerras <paulus@samba.org>
Tue, 8 Nov 2005 00:14:20 +0000 (11:14 +1100)
diff --cc arch/powerpc/kernel/time.c
Simple merge
diff --cc arch/powerpc/mm/hash_utils_64.c
Simple merge
author	Paul Mackerras <paulus@samba.org>
	Tue, 8 Nov 2005 00:14:20 +0000 (11:14 +1100)
committer	Paul Mackerras <paulus@samba.org>
	Tue, 8 Nov 2005 00:14:20 +0000 (11:14 +1100)
		1	2
arch/powerpc/kernel/time.c	patch \|	diff1 \|	diff2 \|	blob \| history
arch/powerpc/mm/hash_utils_64.c	patch \|	diff1 \|	diff2 \|	blob \| history