Merge ../linux-2.6 by hand

2005-10-31 13:37:12 +11:00
parent bd787d438a ed28f96ac1
commit 23fd07750a
2476 changed files with 119495 additions and 59935 deletions
--- a/arch/ppc/kernel/time.c
+++ b/arch/ppc/kernel/time.c
@@ -66,11 +66,6 @@

 #include <asm/time.h>

-/* XXX false sharing with below? */
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 unsigned long disarm_decr[NR_CPUS];

 extern struct timezone sys_tz;