Merge branch 'multitouch' into for-next

author Jiri Kosina <jkosina@suse.cz>

Wed, 30 Nov 2011 14:40:53 +0000 (15:40 +0100)

committer Jiri Kosina <jkosina@suse.cz>

Wed, 30 Nov 2011 14:40:53 +0000 (15:40 +0100)
author Jiri Kosina <jkosina@suse.cz>
Wed, 30 Nov 2011 14:40:53 +0000 (15:40 +0100)
committer Jiri Kosina <jkosina@suse.cz>
Wed, 30 Nov 2011 14:40:53 +0000 (15:40 +0100)
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/Makefile
Simple merge
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/hid/hid-ids.h
Simple merge
diff --cc drivers/hid/hid-multitouch.c
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Wed, 30 Nov 2011 14:40:53 +0000 (15:40 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 30 Nov 2011 14:40:53 +0000 (15:40 +0100)
		1	2
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-multitouch.c	patch \|	diff1 \|	diff2 \|	blob \| history