Pull events into release branch

Conflicts:

	drivers/acpi/video.c

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

diff --cc drivers/acpi/battery.c
Simple merge

diff --cc drivers/acpi/thermal.c
Simple merge

diff --cc drivers/acpi/video.c
index d727d2c715dfa62c63e0839cc8d9c36a8e38cea0,9a5cfcfd8da5c49d012af9124248f3d06edbeaa2..6659bdd2a454ba4b563697cc2f396e8f91ae9206
--- 1/drivers/acpi/video.c
--- 2/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@ -1781,8 -1775,7 +1781,8 @@@ static void acpi_video_bus_notify(acpi_
        switch (event) {
        case ACPI_VIDEO_NOTIFY_SWITCH:  /* User requested a switch,
                                         * most likely via hotkey. */
-               acpi_bus_generate_event(device, event, 0);
+               acpi_bus_generate_proc_event(device, event, 0);
 +              keycode = KEY_SWITCHVIDEOMODE;
                break;
  
        case ACPI_VIDEO_NOTIFY_PROBE:   /* User plugged in or removed a video
@@@ -1790,24 -1783,14 +1790,24 @@@
                acpi_video_device_enumerate(video);
                acpi_video_device_rebind(video);
                acpi_video_switch_output(video, event);
-               acpi_bus_generate_event(device, event, 0);
+               acpi_bus_generate_proc_event(device, event, 0);
 +              keycode = KEY_SWITCHVIDEOMODE;
                break;
  
        case ACPI_VIDEO_NOTIFY_CYCLE:   /* Cycle Display output hotkey pressed. */
-               acpi_bus_generate_event(device, event, 0);
 +              acpi_video_switch_output(video, event);
++              acpi_bus_generate_proc_event(device, event, 0);
 +              keycode = KEY_SWITCHVIDEOMODE;
 +              break;
        case ACPI_VIDEO_NOTIFY_NEXT_OUTPUT:     /* Next Display output hotkey pressed. */
-               acpi_bus_generate_event(device, event, 0);
 +              acpi_video_switch_output(video, event);
++              acpi_bus_generate_proc_event(device, event, 0);
 +              keycode = KEY_VIDEO_NEXT;
 +              break;
        case ACPI_VIDEO_NOTIFY_PREV_OUTPUT:     /* previous Display output hotkey pressed. */
                acpi_video_switch_output(video, event);
-               acpi_bus_generate_event(device, event, 0);
+               acpi_bus_generate_proc_event(device, event, 0);
 +              keycode = KEY_VIDEO_PREV;
                break;
  
        default:
@@@ -1837,37 -1811,21 +1837,37 @@@ static void acpi_video_device_notify(ac
                return;
  
        device = video_device->dev;
 +      bus = video_device->video;
 +      input = bus->input;
  
        switch (event) {
 -      case ACPI_VIDEO_NOTIFY_SWITCH:  /* change in status (cycle output device) */
 -      case ACPI_VIDEO_NOTIFY_PROBE:   /* change in status (output device status) */
 +      case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:        /* Cycle brightness */
 +              acpi_video_switch_brightness(video_device, event);
-               acpi_bus_generate_event(device, event, 0);
+               acpi_bus_generate_proc_event(device, event, 0);
 +              keycode = KEY_BRIGHTNESS_CYCLE;
                break;
 -      case ACPI_VIDEO_NOTIFY_CYCLE_BRIGHTNESS:        /* Cycle brightness */
        case ACPI_VIDEO_NOTIFY_INC_BRIGHTNESS:  /* Increase brightness */
-               acpi_bus_generate_event(device, event, 0);
 +              acpi_video_switch_brightness(video_device, event);
++              acpi_bus_generate_proc_event(device, event, 0);
 +              keycode = KEY_BRIGHTNESSUP;
 +              break;
        case ACPI_VIDEO_NOTIFY_DEC_BRIGHTNESS:  /* Decrease brightness */
-               acpi_bus_generate_event(device, event, 0);
 +              acpi_video_switch_brightness(video_device, event);
++              acpi_bus_generate_proc_event(device, event, 0);
 +              keycode = KEY_BRIGHTNESSDOWN;
 +              break;
        case ACPI_VIDEO_NOTIFY_ZERO_BRIGHTNESS: /* zero brightnesss */
-               acpi_bus_generate_event(device, event, 0);
 +              acpi_video_switch_brightness(video_device, event);
++              acpi_bus_generate_proc_event(device, event, 0);
 +              keycode = KEY_BRIGHTNESS_ZERO;
 +              break;
        case ACPI_VIDEO_NOTIFY_DISPLAY_OFF:     /* display device off */
                acpi_video_switch_brightness(video_device, event);
-               acpi_bus_generate_event(device, event, 0);
+               acpi_bus_generate_proc_event(device, event, 0);
 +              keycode = KEY_DISPLAY_OFF;
                break;
        default:
 +              keycode = KEY_UNKNOWN;
                ACPI_DEBUG_PRINT((ACPI_DB_INFO,
                                  "Unsupported event [0x%x]\n", event));
                break;

diff --cc drivers/misc/asus-laptop.c
Simple merge

diff --cc drivers/misc/sony-laptop.c
Simple merge

diff --cc drivers/pci/hotplug/acpiphp_ibm.c
Simple merge