Merge branch 'autosuspend' into for-next

Conflicts:

	drivers/hid/hid-core.c

diff --cc drivers/hid/hid-core.c
index e56f8d5d3a50ac9ad1388df4a3d29a750425f7c3,feaeb6167ea4c7403d47618039ee4d0e0a804988..5746a5903bcea1a17bfcc7349a2a867bd0833d32
--- 1/drivers/hid/hid-core.c
--- 2/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@@ -1819,6 -1813,31 +1819,22 @@@ void hid_unregister_driver(struct hid_d
  }
  EXPORT_SYMBOL_GPL(hid_unregister_driver);
  
 -#ifdef CONFIG_HID_COMPAT
 -static void hid_compat_load(struct work_struct *ws)
 -{
 -      request_module("hid-dummy");
 -}
 -static DECLARE_WORK(hid_compat_work, hid_compat_load);
 -static struct workqueue_struct *hid_compat_wq;
 -#endif
 -
+ int hid_check_keys_pressed(struct hid_device *hid)
+ {
+       struct hid_input *hidinput;
+       int i;
+ 
+       list_for_each_entry(hidinput, &hid->inputs, list) {
+               for (i = 0; i < BITS_TO_LONGS(KEY_MAX); i++)
+                       if (hidinput->input->key[i])
+                               return 1;
+       }
+ 
+       return 0;
+ }
+ 
+ EXPORT_SYMBOL_GPL(hid_check_keys_pressed);
+ 
  static int __init hid_init(void)
  {
        int ret;

diff --cc drivers/hid/usbhid/hid-core.c
Simple merge

diff --cc drivers/hid/usbhid/hiddev.c
Simple merge

diff --cc include/linux/hid.h
Simple merge