summaryrefslogtreecommitdiff
path: root/virt
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2016-07-28 10:49:23 +0200
committerJiri Kosina <jkosina@suse.cz>2016-07-28 10:49:23 +0200
commit8c2f421c1f0fa7768767ecaad497aa676fc9015a (patch)
treec4e2ed4855fdc0dcbc038f6198f0330f3c9c3fdf /virt
parente82a82c19f4272ea5437cc76e5711b98e2ee6223 (diff)
parentf4c109b660fa1d0453a6dde75bef725304687832 (diff)
downloadlinux-sh-8c2f421c1f0fa7768767ecaad497aa676fc9015a.tar.gz
Merge branch 'for-4.8/hid-led' into for-linus
Conflicts: drivers/hid/hid-thingm.c
Diffstat (limited to 'virt')
0 files changed, 0 insertions, 0 deletions