]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:33:42 +0000 (11:33 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 22 May 2012 09:35:11 +0000 (11:35 +0200)
commitffc805dce0fc51a3dd045863d6a668f2ac630973
tree9dbe8427ee72d1aa2fce24a53df2723c3745e2be
parent07c5df2b9ba25a76e452c1b6b5208e52cddb8365
parent20cfa1ad4d7f1633cb59dad8e43e11ef7dff9cde
parentd067deb1004d9a6a0029f5cd84dd668114d8f939
parent3b95bbe82cf8ced8d2d6e010d5617d96cb995ba9
Merge branches 'upstream-fixes', 'wacom' and 'waltop' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/Kconfig
drivers/hid/hid-apple.c
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-logitech-dj.c