76 files changed, 714 insertions, 530 deletions

diff --git a/CREDITS b/CREDITS
index 50121d432b62..f553f8cfaa62 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2423,8 +2423,7 @@ S: Toronto, Ontario
 S: Canada
 
 N: Zwane Mwaikambo
-E: zwane@linuxpower.ca
-W: http://function.linuxpower.ca
+E: zwane@arm.linux.org.uk
 D: Various driver hacking
 D: Lowlevel x86 kernel hacking
 D: General debugging
diff --git a/MAINTAINERS b/MAINTAINERS
index 33122b1519ca..564a03e61a0c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1739,7 +1739,7 @@ S:	Maintained
 
 OPL3-SA2, SA3, and SAx DRIVER
 P:      Zwane Mwaikambo
-M:      zwane@commfireservices.com
+M:      zwane@arm.linux.org.uk
 L:      linux-sound@vger.kernel.org
 S:      Maintained
 
@@ -1995,7 +1995,7 @@ S:	Maintained
 
 SC1200 WDT DRIVER
 P:      Zwane Mwaikambo
-M:      zwane@commfireservices.com
+M:      zwane@arm.linux.org.uk
 S:      Maintained
 
 SCHEDULER
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c
index bd1dbf3bd223..a22a866de8f9 100644
--- a/arch/i386/kernel/apic.c
+++ b/arch/i386/kernel/apic.c
@@ -726,15 +726,11 @@ __setup("apic=", apic_set_verbosity);
 static int __init detect_init_APIC (void)
 {
         u32 h, l, features;
-        extern void get_cpu_vendor(struct cpuinfo_x86*);
 
         /* Disabled by kernel option? */
         if (enable_local_apic < 0)
                 return -1;
 
-        /* Workaround for us being called before identify_cpu(). */
-        get_cpu_vendor(&boot_cpu_data);
-
         switch (boot_cpu_data.x86_vendor) {
         case X86_VENDOR_AMD:
                 if ((boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model > 1) ||
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index da6c46d667cb..8c242bb1ef45 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -195,7 +195,7 @@ static void disable_lapic_nmi_watchdog(void)
                         wrmsr(MSR_P6_EVNTSEL0, 0, 0);
                         break;
                 case 15:
-                        if (boot_cpu_data.x86_model > 0x3)
+                        if (boot_cpu_data.x86_model > 0x4)
                                 break;
 
                         wrmsr(MSR_P4_IQ_CCCR0, 0, 0);
@@ -432,7 +432,7 @@ void setup_apic_nmi_watchdog (void)
                         setup_p6_watchdog();
                         break;
                 case 15:
-                        if (boot_cpu_data.x86_model > 0x3)
+                        if (boot_cpu_data.x86_model > 0x4)
                                 return;
 
                         if (!setup_p4_watchdog())
diff --git a/arch/ppc/syslib/ppc4xx_dma.c b/arch/ppc/syslib/ppc4xx_dma.c
index 5015ab99afd2..f15e64285f96 100644
--- a/arch/ppc/syslib/ppc4xx_dma.c
+++ b/