summaryrefslogtreecommitdiffstats
path: root/drivers/hid/hid-elecom.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2017-04-10 23:40:42 +0200
committerDave Airlie <airlied@redhat.com>2017-04-10 23:40:42 +0200
commitb769fefb68cd70385d68220ae341e5a10723fbc0 (patch)
treea2881410c9dc5a3474619d155fac981cfbd4ee8f /drivers/hid/hid-elecom.c
parentMerge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux int... (diff)
parentLinux 4.11-rc6 (diff)
downloadlinux-b769fefb68cd70385d68220ae341e5a10723fbc0.tar.xz
linux-b769fefb68cd70385d68220ae341e5a10723fbc0.zip
Backmerge tag 'v4.11-rc6' into drm-next
Linux 4.11-rc6 drm-misc needs 4.11-rc5, may as well fix conflicts with rc6.
Diffstat (limited to 'drivers/hid/hid-elecom.c')
0 files changed, 0 insertions, 0 deletions