]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita5aa94132bc88e994da336d3da70ba0674cb066b
treeb195f683a4873c0bf5357b1d993df344e67b96d4
parentef607aa74eeb23d49e5598b1d0e29bbc03d1868a
parent1c45d5d490e99a03b55b821f1d7a46a9cb5d6f44
parentfc1c33f917868024aebafd2e6f1adaba0fe06eb3
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