Learn more about cloning repositories
You have read-only access
Merge branch 'upstream' into for-linus Conflicts: drivers/hid/hid-core.c drivers/hid/hid-ids.h