Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Fri, 12 Dec 2014 10:09:23 +0000 (11:09 +0100)
committerJiri Kosina <jkosina@suse.cz>
Fri, 12 Dec 2014 10:09:23 +0000 (11:09 +0100)
commit3ee420ba2e7fa074a668e30c2d0f4abd317e4927
treeb195f683a4873c0bf5357b1d993df344e67b96d4
parenta32c99e7ab8410bae7c276a7e94ca84d108de034
parentd1c7e29e8d276c669e8790bb8be9f505ddc48888
parent7bb9d643651180f081cfcc1ed43ff685eda8a358
Merge branches 'for-3.18/upstream-fixes' and 'for-3.19/upstream' into for-linus

Conflicts:
drivers/hid/hid-input.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c