Merge http://linus.bkbits.net/linux-2.5

into heisenberg.transvirtual.com:/tmp/linus-2.5

arch/i386/kernel/nmi.c

@@ -73,7 +73,7 @@ extern void show_registers(struct pt_regs *regs);
 int __init check_nmi_watchdog (void)
 {
 	irq_cpustat_t tmp[NR_CPUS];
-	int j, cpu;
+	int cpu;
 
 	printk(KERN_INFO "testing NMI watchdog ... ");
 

arch/i386/mm/pageattr.c

@@ -11,6 +11,7 @@
 #include <linux/slab.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
+#include <asm/tlbflush.h>
 
 static inline pte_t *lookup_address(unsigned long address) 
 { 

drivers/acpi/osl.c

@@ -33,6 +33,7 @@
 #include <linux/interrupt.h>
 #include <linux/kmod.h>
 #include <linux/delay.h>
+#include <linux/tqueue.h>
 #include <asm/io.h>
 #include "acpi.h"
 

drivers/usb/core/hub.h

@@ -9,6 +9,7 @@
  */
 
 #include <linux/list.h>
+#include <linux/tqueue.h>
 #include <linux/compiler.h>	/* likely()/unlikely() */
 
 /*

include/linux/namei.h

@@ -40,7 +40,6 @@ extern int FASTCALL(__user_walk(const char *, unsigned, struct nameidata *));
 	__user_walk(name, LOOKUP_FOLLOW, nd)
 #define user_path_walk_link(name,nd) \
 	__user_walk(name, 0, nd)
-extern int FASTCALL(path_init(const char *, unsigned, struct nameidata *));
 extern int FASTCALL(path_lookup(const char *, unsigned, struct nameidata *));
 extern int FASTCALL(path_walk(const char *, struct nameidata *));
 extern int FASTCALL(link_path_walk(const char *, struct nameidata *));

kernel/ksyms.c

@@ -148,7 +148,6 @@ EXPORT_SYMBOL(follow_up);
 EXPORT_SYMBOL(follow_down);
 EXPORT_SYMBOL(lookup_mnt);
 EXPORT_SYMBOL(path_lookup);
-EXPORT_SYMBOL(path_init);
 EXPORT_SYMBOL(path_walk);
 EXPORT_SYMBOL(path_release);
 EXPORT_SYMBOL(__user_walk);