summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-12-12 11:09:23 +0100
committerJiri Kosina <jkosina@suse.cz>2014-12-12 11:09:23 +0100
commit3ee420ba2e7fa074a668e30c2d0f4abd317e4927 (patch)
treeb195f683a4873c0bf5357b1d993df344e67b96d4 /drivers
parenta32c99e7ab8410bae7c276a7e94ca84d108de034 (diff)
parentd1c7e29e8d276c669e8790bb8be9f505ddc48888 (diff)
parent7bb9d643651180f081cfcc1ed43ff685eda8a358 (diff)
Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus
Conflicts: drivers/hid/hid-input.c