summaryrefslogtreecommitdiff
path: root/drivers/hid/hid-ntrig.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-11-03 14:45:16 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-11-03 14:45:16 -0800
commit84a73014d86fd660822a20c032625e3afe99ca58 (patch)
tree9e42a2d3c40730947ae18363d00e8a0ee2743792 /drivers/hid/hid-ntrig.c
parent195562194aad3a0a3915941077f283bcc6347b9b (diff)
parentbf5f18d708802737fa0db6306f6b9148f85b2efd (diff)
Merge branch 'next' into for-linus
Prepare first round of input updates for 4.3 merge window.
Diffstat (limited to 'drivers/hid/hid-ntrig.c')
0 files changed, 0 insertions, 0 deletions