]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'for-3.15/microsoft' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:06:41 +0000 (19:06 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 1 Apr 2014 17:06:41 +0000 (19:06 +0200)
commit3681ba36ec226b76aa388ddd6bfc3943d56e2895
tree418b338bcb2014768ede10e73179c7afbaf1736d
parent88712d340f7420c72221365b17bcc56517bdc35a
parent2e0683f2f69913ce1693e50d0825d1ecea091654
Merge branch 'for-3.15/microsoft' into for-linus

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