Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (36 commits)
  HID: hid-multitouch: cosmetic changes, sort classes and devices
  HID: hid-multitouch: class MT_CLS_STANTUM is redundant with MT_CLS_CONFIDENCE
  HID: hid-multitouch: add support for Unitec panels
  HID: hid-multitouch: add support for Touch International panels
  HID: hid-multitouch: add support for GoodTouch panels
  HID: hid-multitouch: add support for CVTouch panels
  HID: hid-multitouch: add support for ActionStar panels
  HID: hiddev: fix race between hiddev_disconnect and hiddev_release
  HID: magicmouse: ignore 'ivalid report id' while switching modes
  HID: fix a crash in hid_report_raw_event() function.
  HID: hid-multitouch: add support for Elo TouchSystems 2515 IntelliTouch Plus
  HID: assorted usage updates from hut 1.12
  HID: roccat: fix actual/startup profile sysfs attribute in koneplus
  HID: hid-multitouch: Add support for Lumio panels
  HID: 'name' and 'phys' in 'struct hid_device' can never be NULL
  HID: hid-multitouch: add support for Ilitek dual-touch panel
  HID: picolcd: Avoid compile warning/error triggered by copy_from_user()
  HID: add support for Logitech G27 wheel
  HID: hiddev: fix error path in hiddev_read when interrupted
  HID: add support for Sony Navigation Controller
  ...

diff --combined net/bluetooth/hidp/hidp.h
index 12822cd,c9be803..19e9500
--- 1/net/bluetooth/hidp/hidp.h
--- 2/net/bluetooth/hidp/hidp.h
+++ b/net/bluetooth/hidp/hidp.h
@@@ -80,12 -80,12 +80,12 @@@
  #define HIDP_VIRTUAL_CABLE_UNPLUG     0
  #define HIDP_BOOT_PROTOCOL_MODE               1
  #define HIDP_BLUETOOTH_VENDOR_ID      9
- #define       HIDP_WAITING_FOR_RETURN         10
+ #define HIDP_WAITING_FOR_RETURN               10
  #define HIDP_WAITING_FOR_SEND_ACK     11
  
  struct hidp_connadd_req {
 -      int   ctrl_sock;        // Connected control socket
 -      int   intr_sock;        // Connteted interrupt socket
 +      int   ctrl_sock;        /* Connected control socket */
 +      int   intr_sock;        /* Connected interrupt socket */
        __u16 parser;
        __u16 rd_size;
        __u8 __user *rd_data;
@@@ -142,7 -142,7 +142,7 @@@ struct hidp_session 
        uint ctrl_mtu;
        uint intr_mtu;
  
 -      atomic_t terminate;
 +      struct task_struct *task;
  
        unsigned char keys[8];
        unsigned char leds;