Linus Torvalds 0f1b1e6d73 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid ... Pull HID updates from Jiri Kosina: - substantial cleanup of the generic and transport layers, in the direction of an ultimate goal of making struct hid_device completely transport independent, by Benjamin Tissoires - cp2112 driver from David Barksdale - a lot of fixes and new hardware support (Dualshock 4) to hid-sony driver, by Frank Praznik - support for Win 8.1 multitouch protocol by Andrew Duggan - other smaller fixes / device ID additions * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (75 commits) HID: sony: fix force feedback mismerge HID: sony: Set the quriks flag for Bluetooth controllers HID: sony: Fix Sixaxis cable state detection HID: uhid: Add UHID_CREATE2 + UHID_INPUT2 HID: hyperv: fix _raw_request() prototype HID: hyperv: Implement a stub raw_request() entry point HID: hid-sensor-hub: fix sleeping function called from invalid context HID: multitouch: add support for Win 8.1 multitouch touchpads HID: remove hid_output_raw_report transport implementations HID: sony: do not rely on hid_output_raw_report HID: cp2112: remove the last hid_output_raw_report() call HID: cp2112: remove various hid_out_raw_report calls HID: multitouch: add support of other generic collections in hid-mt HID: multitouch: remove pen special handling HID: multitouch: remove registered devices with default behavior HID: hidp: Add a comment that some devices depend on the current behavior of uniq HID: sony: Prevent duplicate controller connections. HID: sony: Perform a boundry check on the sixaxis battery level index. HID: sony: Fix work queue issues HID: sony: Fix multi-line comment styling ...		2014-04-02 16:24:28 -07:00
..
bnep	net/*: Fix FSF address in file headers	2013-12-06 12:37:57 -05:00
cmtp	Bluetooth: Access CMTP session addresses through L2CAP channel	2013-10-13 20:00:30 +03:00
hidp	Merge branch 'for-3.15/hid-core-ll-transport-cleanup' into for-linus	2014-04-01 19:05:09 +02:00
rfcomm	Bluetooth: Remove rfcomm_carrier_raised()	2014-01-06 13:51:45 -08:00
6lowpan.c	Bluetooth: Fix 6loWPAN peer lookup	2014-01-07 11:32:15 -02:00
6lowpan.h	Bluetooth: Enable 6LoWPAN support for BT LE devices	2013-12-11 12:57:55 -08:00
a2mp.c	Bluetooth: Ignore A2MP data on non-BR/EDR links	2013-10-16 01:41:13 -07:00
a2mp.h	Bluetooth: Move a2mp.h header file into net/bluetooth/	2013-10-11 00:10:05 +02:00
af_bluetooth.c	Bluetooth: Increase minor version of core module	2013-12-07 21:29:43 +04:00
amp.c	Bluetooth: Remove l2cap_conn->dst usage from AMP manager	2013-10-13 17:43:32 +03:00
amp.h	Bluetooth: Move amp.h header file into net/bluetooth/	2013-10-11 00:10:03 +02:00
hci_conn.c	Bluetooth: Expose debugfs settings for LE connection interval	2013-10-19 18:56:54 +03:00
hci_core.c	Bluetooth: Add quirk for disabling Delete Stored Link Key command	2014-01-04 20:10:40 +02:00
hci_event.c	Bluetooth: Enable 6LoWPAN support for BT LE devices	2013-12-11 12:57:55 -08:00
hci_sock.c	Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth	2013-12-18 13:46:08 -05:00
hci_sysfs.c	Bluetooth: Remove bus attribute in favor of hierarchy	2013-10-19 16:25:55 +03:00
Kconfig	net: move 6lowpan compression code to separate module	2014-01-15 15:36:38 -08:00
l2cap_core.c	Bluetooth: Enable 6LoWPAN support for BT LE devices	2013-12-11 12:57:55 -08:00
l2cap_sock.c	net: add build-time checks for msg->msg_name size	2014-01-18 23:04:16 -08:00
lib.c
Makefile	Bluetooth: remove direct compilation of 6lowpan_iphc.c	2014-01-17 19:13:49 -08:00
mgmt.c	Bluetooth: Add an extra check in mgmt_device_disconnected()	2013-12-04 11:09:03 -02:00
sco.c	net: rework recvmsg handler msg_name and msg_namelen logic	2013-11-20 21:52:30 -05:00
smp.c	Bluetooth: Add smp_sufficient_security helper function	2013-12-05 07:05:33 -08:00
smp.h	Bluetooth: Add smp_sufficient_security helper function	2013-12-05 07:05:33 -08:00