git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic_linux-4.9.git/commit

projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 2c2110e 9ed3269)

author	Jiri Kosina <jkosina@suse.cz>
	Sat, 5 May 2012 21:30:42 +0000 (23:30 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Sat, 5 May 2012 21:31:15 +0000 (23:31 +0200)
commit	645832cce2955bdcd0c3166478b84ea7afd0ea53
tree	5daea112580bc5467071423e1d7ea90dfb7cb4df	tree \| snapshot (tar.gz zip)
parent	2c2110e90b5a859cea8eccad9d42a44da9bfdc2a	commit \| diff
parent	9ed326951806c424b42dcf2e1125e25a98fb13d1	commit \| diff

Merge branch 'multitouch' into device-groups

I am merging multitouch branch into device-groups so that support
for Baanto device can be adjusted accordingly to the new autoloading
patches.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>

drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-multitouch.c	diff1 \|	diff2 \|	blob \| history