Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next

diff --combined arch/microblaze/kernel/setup.c
index 61dc739,71af974..16d8dfd
--- 1/arch/microblaze/kernel/setup.c
--- 2/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@@ -30,7 -30,6 +30,6 @@@
  #include <asm/entry.h>
  #include <asm/cpuinfo.h>
  
- #include <asm/system.h>
  #include <asm/prom.h>
  #include <asm/pgtable.h>
  
@@@ -51,8 -50,6 +50,6 @@@ void __init setup_arch(char **cmdline_p
  
        unflatten_device_tree();
  
-       /* NOTE I think that this function is not necessary to call */
-       /* irq_early_init(); */
        setup_cpuinfo();
  
        microblaze_cache_init();
@@@ -209,7 -206,6 +206,7 @@@ static int microblaze_debugfs_init(void
  }
  arch_initcall(microblaze_debugfs_init);
  
 +# ifdef CONFIG_MMU
  static int __init debugfs_tlb(void)
  {
        struct dentry *d;
@@@ -222,7 -218,6 +219,7 @@@
                return -ENOMEM;
  }
  device_initcall(debugfs_tlb);
 +# endif
  #endif
  
  static int dflt_bus_notify(struct notifier_block *nb,