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