Pull misc-for-upstream into release branch
Len Brown [Fri, 16 Feb 2007 23:52:41 +0000 (18:52 -0500)]
Conflicts:

drivers/usb/misc/appledisplay.c

Signed-off-by: Len Brown <len.brown@intel.com>

1  2 
MAINTAINERS
drivers/acpi/processor_idle.c
drivers/acpi/thermal.c
drivers/usb/misc/appledisplay.c

diff --cc MAINTAINERS
Simple merge
  #include <linux/moduleparam.h>
  #include <linux/sched.h>      /* need_resched() */
  #include <linux/latency.h>
 +#include <linux/clockchips.h>
 +
 +/*
 + * Include the apic definitions for x86 to have the APIC timer related defines
 + * available also for UP (on SMP it gets magically included via linux/smp.h).
 + * asm/acpi.h is not an option, as it would require more include magic. Also
 + * creating an empty asm-ia64/apic.h would just trade pest vs. cholera.
 + */
 +#ifdef CONFIG_X86
 +#include <asm/apic.h>
 +#endif
  
+ /*
+  * Include the apic definitions for x86 to have the APIC timer related defines
+  * available also for UP (on SMP it gets magically included via linux/smp.h).
+  */
+ #ifdef CONFIG_X86
+ #include <asm/apic.h>
+ #endif
  #include <asm/io.h>
  #include <asm/uaccess.h>
  
Simple merge
@@@ -281,8 -281,8 +281,8 @@@ static int appledisplay_probe(struct us
        /* Register backlight device */
        snprintf(bl_name, sizeof(bl_name), "appledisplay%d",
                atomic_inc_return(&count_displays) - 1);
-       pdata->bd = backlight_device_register(bl_name, NULL,
-               pdata, &appledisplay_bl_data);
 -      pdata->bd = backlight_device_register(bl_name, NULL, pdata
++      pdata->bd = backlight_device_register(bl_name, NULL, pdata,
+                                               &appledisplay_bl_data);
        if (IS_ERR(pdata->bd)) {
                err("appledisplay: Backlight registration failed");
                goto error;