]> 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)
commit4ee740874f5c65a1b1dead067a78b58e5891d8b6
tree46673a3c432958a4f712b064ddb9b645771cc0c3
parent4913119e6d64f7a763156d3601ea6880e881f0d7
parentffb1033a682e1c0279e56912c4a4ff4349d1bbc9
Merge branch 'multitouch' into for-linus

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