Merge branches 'for-3.13/upstream-fixes', 'for-3.14/i2c-hid', 'for-3.14/sensor-hub...

author Jiri Kosina <jkosina@suse.cz>

Wed, 22 Jan 2014 14:40:14 +0000 (15:40 +0100)

committer Jiri Kosina <jkosina@suse.cz>

Wed, 22 Jan 2014 14:40:14 +0000 (15:40 +0100)
author Jiri Kosina <jkosina@suse.cz>
Wed, 22 Jan 2014 14:40:14 +0000 (15:40 +0100)
committer Jiri Kosina <jkosina@suse.cz>
Wed, 22 Jan 2014 14:40:14 +0000 (15:40 +0100)
diff --cc drivers/hid/Kconfig
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
diff --cc drivers/hid/i2c-hid/i2c-hid.c
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Wed, 22 Jan 2014 14:40:14 +0000 (15:40 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 22 Jan 2014 14:40:14 +0000 (15:40 +0100)
		1	2	3	4	5
drivers/hid/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/hid-core.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/hid-ids.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/hid-multitouch.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
drivers/hid/i2c-hid/i2c-hid.c	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history