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

Conflicts:

	drivers/net/tg3.c
	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/mac80211/ieee80211_i.h

1 files changed, 9 insertions, 1 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 19709a079635..853d1f11be00 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -117,7 +117,10 @@ acpi_get_sysname(void)
         if (!strcmp(hdr->oem_id, "HP")) {
                 return "hpzx1";
         } else if (!strcmp(hdr->oem_id, "SGI")) {
-                return "sn2";
+                if (!strcmp(hdr->oem_table_id + 4, "UV"))
+                        return "uv";
+                else
+                        return "sn2";
         }
 
         return "dig";
@@ -130,6 +133,8 @@ acpi_get_sysname(void)
         return "hpzx1_swiotlb";
 # elif defined (CONFIG_IA64_SGI_SN2)
         return "sn2";
+# elif defined (CONFIG_IA64_SGI_UV)
+        return "uv";
 # elif defined (CONFIG_IA64_DIG)
         return "dig";
 # else
@@ -622,6 +627,9 @@ void acpi_unregister_gsi(u32 gsi)
         if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
                 return;
 
+        if (has_8259 && gsi < 16)
+                return;
+
         iosapic_unregister_intr(gsi);
 }