Merge branch 'bjorn-notify' into release

Conflicts:
	drivers/platform/x86/eeepc-laptop.c

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

diff --cc drivers/platform/x86/eeepc-laptop.c
index 8153b3e5918967bb1662c44523d1ab7eab233d69,1e28413060b26416c9332aefeb840bf5a64a63d7..46b5aa5e85f041214d4611a34b2282c516ec5f0e
--- 1/drivers/platform/x86/eeepc-laptop.c
--- 2/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
@@@ -180,7 -180,7 +180,8 @@@ static struct key_entry eeepc_keymap[] 
   */
  static int eeepc_hotk_add(struct acpi_device *device);
  static int eeepc_hotk_remove(struct acpi_device *device, int type);
 +static int eeepc_hotk_resume(struct acpi_device *device);
+ static void eeepc_hotk_notify(struct acpi_device *device, u32 event);
  
  static const struct acpi_device_id eeepc_device_ids[] = {
        {EEEPC_HOTK_HID, 0},
@@@ -195,7 -196,7 +197,8 @@@ static struct acpi_driver eeepc_hotk_dr
        .ops = {
                .add = eeepc_hotk_add,
                .remove = eeepc_hotk_remove,
 +              .resume = eeepc_hotk_resume,
+               .notify = eeepc_hotk_notify,
        },
  };
  
@@@ -547,18 -569,10 +550,18 @@@ static void eeepc_rfkill_hotplug(void
                }
        }
  
 -      rfkill_force_state(ehotk->eeepc_wlan_rfkill, state);
 +      rfkill_set_sw_state(ehotk->eeepc_wlan_rfkill, blocked);
 +}
 +
 +static void eeepc_rfkill_notify(acpi_handle handle, u32 event, void *data)
 +{
 +      if (event != ACPI_NOTIFY_BUS_CHECK)
 +              return;
 +
 +      eeepc_rfkill_hotplug();
  }
  
- static void eeepc_hotk_notify(acpi_handle handle, u32 event, void *data)
+ static void eeepc_hotk_notify(struct acpi_device *device, u32 event)
  {
        static struct key_entry *key;
        u16 count;

diff --cc include/acpi/acpi_bus.h
Simple merge