Learn more about cloning repositories
You have read-only access
Merge branches 'for-3.15/upstream-fixes' and 'for-3.16/upstream' into for-linus Conflicts: drivers/hid/hid-sensor-hub.c