]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into...
authorJiri Kosina <jkosina@suse.cz>
Thu, 4 Jul 2013 13:02:26 +0000 (15:02 +0200)
committerJiri Kosina <jkosina@suse.cz>
Thu, 4 Jul 2013 13:02:26 +0000 (15:02 +0200)
commit08ec2dcc3527a20c619aca2fb36f800908256bac
treeb39578fe388ab30ba03d4f1dffa9b7be801262d3
parentdb58316892a5e9034efe718d4c1630788db7528f
parentadb91aef9f9965341a9252bd610b5d828d5c016f
parent078328da5d5dfbd2b1333eb545bd89d6dfa984ef
parent3685c18e17f12438d0a83331c1b6a5b00fade7a1
Merge branches 'for-3.11/multitouch', 'for-3.11/sony' and 'for-3.11/upstream' into for-linus

Conflicts:
drivers/hid/hid-core.c
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
drivers/hid/hid-input.c
drivers/hid/hid-multitouch.c