]> 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)
commitffc8bbe68d2d1b9651603a54a3bce82bb6a94a1d
tree418b338bcb2014768ede10e73179c7afbaf1736d
parent103fabc5ec4abfbea1a4363b0cc5a87a8fadf24a
parent4517c441e698b88f88753e2300a657adb219e1ad
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