]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'multitouch' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 1 Oct 2012 12:38:54 +0000 (14:38 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 1 Oct 2012 12:38:54 +0000 (14:38 +0200)
commitddc3cf7c8aa9a79df59f99c474606d29e51eb00a
tree46673a3c432958a4f712b064ddb9b645771cc0c3
parent83bc8583925a878b150c6934290427e3e954e590
parentc5972b51cead9b458c816bdd61586ce82122b70e
Merge branch 'multitouch' into for-linus

Conflicts:
drivers/hid/hid-multitouch.c
drivers/hid/hid-ids.h
drivers/hid/hid-multitouch.c