Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (134 commits)
  powerpc/nvram: Enable use Generic NVRAM driver for different size chips
  powerpc/iseries: Fix oops reading from /proc/iSeries/mf/*/cmdline
  powerpc/ps3: Workaround for flash memory I/O error
  powerpc/booke: Don't set DABR on 64-bit BookE, use DAC1 instead
  powerpc/perf_counters: Reduce stack usage of power_check_constraints
  powerpc: Fix bug where perf_counters breaks oprofile
  powerpc/85xx: Fix SMP compile error and allow NULL for smp_ops
  powerpc/irq: Improve nanodoc
  powerpc: Fix some late PowerMac G5 with PCIe ATI graphics
  powerpc/fsl-booke: Use HW PTE format if CONFIG_PTE_64BIT
  powerpc/book3e: Add missing page sizes
  powerpc/pseries: Fix to handle slb resize across migration
  powerpc/powermac: Thermal control turns system off too eagerly
  powerpc/pci: Merge ppc32 and ppc64 versions of phb_scan()
  powerpc/405ex: support cuImage via included dtb
  powerpc/405ex: provide necessary fixup function to support cuImage
  powerpc/40x: Add support for the ESTeem 195E (PPC405EP) SBC
  powerpc/44x: Add Eiger AMCC (AppliedMicro) PPC460SX evaluation board support.
  powerpc/44x: Update Arches defconfig
  powerpc/44x: Update Arches dts
  ...

Fix up conflicts in drivers/char/agp/uninorth-agp.c

2 files changed, 6 insertions, 4 deletions

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index a0f68386c12f..588a5b0bc4b5 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -294,10 +294,11 @@ static void macio_setup_interrupts(struct macio_dev *dev)
         int i = 0, j = 0;
 
         for (;;) {
-                struct resource *res = &dev->interrupt[j];
+                struct resource *res;
 
                 if (j >= MACIO_DEV_COUNT_IRQS)
                         break;
+                res = &dev->interrupt[j];
                 irq = irq_of_parse_and_map(np, i++);
                 if (irq == NO_IRQ)
                         break;
@@ -321,9 +322,10 @@ static void macio_setup_resources(struct macio_dev *dev,
         int index;
 
         for (index = 0; of_address_to_resource(np, index, &r) == 0; index++) {
-                struct resource *res = &dev->resource[index];
+                struct resource *res;
                 if (index >= MACIO_DEV_COUNT_RESOURCES)
                         break;
+                res = &dev->resource[index];
                 *res = r;
                 res->name = dev_name(&dev->ofdev.dev);
 
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 40023313a760..8b9364434aa0 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -239,8 +239,8 @@ setup_hardware( void )
          * to be on the safe side (OSX doesn't)...
          */
         if( x.overheat_temp == (80 << 8) ) {
-                x.overheat_temp = 65 << 8;
-                x.overheat_hyst = 60 << 8;
+                x.overheat_temp = 75 << 8;
+                x.overheat_hyst = 70 << 8;
                 write_reg( x.thermostat, 2, x.overheat_hyst, 2 );
                 write_reg( x.thermostat, 3, x.overheat_temp, 2 );