From: Jiri Kosina on

please pull from 'for-linus' branch at

git:// for-linus

to receive 2nd round of merge window updates for HID subsystem.

Most importantly, there is a fixup patch for driver core API change which
didn't make it from linux-next to Greg's tree from Stephen Rothwell.

On top of that, there is an update to roccat driver which was by mistake
omitted in the initial large pull request.

Plus one minor device ID addition.


Cory Maccarrone (1):
HID: Add the GYR4101US USB ID to hid-gyration

Jiri Kosina (1):
HID: roccat: fix build failure if built as module

Stefan Achatz (1):
HID: roccat: propagate special events of roccat hardware to userspace

Stephen Rothwell (1):
HID: fix hid-roccat-kone for bin_attr API change

drivers/hid/Kconfig | 8 +
drivers/hid/Makefile | 1 +
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-gyration.c | 1 +
drivers/hid/hid-ids.h | 1 +
drivers/hid/hid-roccat-kone.c | 73 ++++++--
drivers/hid/hid-roccat-kone.h | 9 +
drivers/hid/hid-roccat.c | 428 +++++++++++++++++++++++++++++++++++++++++
drivers/hid/hid-roccat.h | 31 +++
9 files changed, 541 insertions(+), 12 deletions(-)
create mode 100644 drivers/hid/hid-roccat.c
create mode 100644 drivers/hid/hid-roccat.h
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)
More majordomo info at
Please read the FAQ at