]> 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)
commitd385315624e25f2e6792136f0a90a97a3e89b44c
treeb195f683a4873c0bf5357b1d993df344e67b96d4
parent288139919813708ef06ea577649ba820bf623e4b
parente7a2e371bed8c4463014910339cb46ff3d780f04
parent1ec5868b197a092146eb7829236631207daa66c0
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