Merge branch 'uhid' into for-linus
Conflicts: drivers/hid/Kconfig
Showing
Documentation/hid/uhid.txt
0 → 100644
drivers/hid/uhid.c
0 → 100644
include/linux/uhid.h
0 → 100644
samples/uhid/Makefile
0 → 100644
samples/uhid/uhid-example.c
0 → 100644
Please register or sign in to comment