Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	arch/x86/kernel/io_apic.c

1 files changed, 11 insertions, 0 deletions

diff --git a/init/main.c b/init/main.c
index 17e9757bfde2..2a7ce0f8e453 100644
--- a/init/main.c
+++ b/init/main.c
@@ -540,6 +540,15 @@ void __init __weak thread_info_cache_init(void)
 {
 }
 
+void __init __weak arch_early_irq_init(void)
+{
+}
+
+void __init __weak early_irq_init(void)
+{
+        arch_early_irq_init();
+}
+
 asmlinkage void __init start_kernel(void)
 {
         char * command_line;
@@ -604,6 +613,8 @@ asmlinkage void __init start_kernel(void)
         sort_main_extable();
         trap_init();
         rcu_init();
+        /* init some links before init_ISA_irqs() */
+        early_irq_init();
         init_IRQ();
         pidhash_init();
         init_timers();