Merge linux-2.6 with linux-acpi-2.6

diff --cc arch/i386/Kconfig
Simple merge

diff --cc arch/i386/kernel/Makefile
Simple merge

diff --cc arch/i386/kernel/acpi/boot.c
Simple merge

diff --cc arch/i386/kernel/io_apic.c
Simple merge

diff --cc arch/i386/kernel/mpparse.c
Simple merge

diff --cc arch/i386/kernel/setup.c
Simple merge

diff --cc arch/i386/mach-es7000/es7000plat.c
index f549c0e,2000bdc..dc66605
--- 1/arch/i386/mach-es7000/es7000plat.c
--- 2/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/i386/mach-es7000/es7000plat.c
@@@ -73,8 -73,25 +73,25 @@@ es7000_rename_gsi(int ioapic, int gsi
        return gsi;
  }
  
 -#endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER || CONFIG_ACPI_BOOT)
 +#endif        /* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */
  
+ void __init
+ setup_unisys ()
+ {
+       /*
+        * Determine the generation of the ES7000 currently running.
+        *
+        * es7000_plat = 1 if the machine is a 5xx ES7000 box
+        * es7000_plat = 2 if the machine is a x86_64 ES7000 box
+        *
+        */
+       if (!(boot_cpu_data.x86 <= 15 && boot_cpu_data.x86_model <= 2))
+               es7000_plat = 2;
+       else
+               es7000_plat = 1;
+       ioapic_renumber_irq = es7000_rename_gsi;
+ }
+ 
  /*
   * Parse the OEM Table
   */

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc arch/x86_64/Kconfig
Simple merge

diff --cc arch/x86_64/kernel/Makefile
Simple merge

diff --cc arch/x86_64/kernel/genapic.c
Simple merge

diff --cc arch/x86_64/kernel/io_apic.c
Simple merge

diff --cc arch/x86_64/kernel/setup.c
Simple merge

diff --cc drivers/char/hpet.c
Simple merge

diff --cc drivers/char/ipmi/ipmi_si_intf.c
index adbec73,1abec68..278f841
--- 1/drivers/char/ipmi/ipmi_si_intf.c
--- 2/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@@ -2070,20 -2092,16 +2095,16 @@@ static int init_one_smi(int intf_num, s
        rv = try_init_mem(intf_num, &new_smi);
        if (rv)
                rv = try_init_port(intf_num, &new_smi);
 -#ifdef CONFIG_ACPI_INTERPRETER
 +#ifdef CONFIG_ACPI
-       if ((rv) && (si_trydefaults)) {
+       if (rv && si_trydefaults)
                rv = try_init_acpi(intf_num, &new_smi);
-       }
  #endif
  #ifdef CONFIG_X86
-       if ((rv) && (si_trydefaults)) {
+       if (rv && si_trydefaults)
                rv = try_init_smbios(intf_num, &new_smi);
-         }
  #endif
-       if ((rv) && (si_trydefaults)) {
+       if (rv && si_trydefaults)
                rv = try_init_plug_and_play(intf_num, &new_smi);
-       }
- 
  
        if (rv)
                return rv;

diff --cc drivers/pnp/pnpacpi/rsparser.c
Simple merge

diff --cc drivers/serial/Kconfig
Simple merge

diff --cc include/asm-i386/mpspec.h
Simple merge

diff --cc kernel/power/Kconfig
Simple merge