Merge branches 'for-3.16/i2c-hid', 'for-3.16/rmi4', 'for-3.16/sony' and 'for-3.16...

author Jiri Kosina <jkosina@suse.cz>

Wed, 4 Jun 2014 11:09:43 +0000 (13:09 +0200)

committer Jiri Kosina <jkosina@suse.cz>

Wed, 4 Jun 2014 11:09:43 +0000 (13:09 +0200)
author Jiri Kosina <jkosina@suse.cz>
Wed, 4 Jun 2014 11:09:43 +0000 (13:09 +0200)
committer Jiri Kosina <jkosina@suse.cz>
Wed, 4 Jun 2014 11:09:43 +0000 (13:09 +0200)
diff --cc drivers/hid/Kconfig
Simple merge
diff --cc drivers/hid/hid-core.c
Simple merge
diff --cc drivers/leds/Kconfig
Simple merge
diff --cc include/linux/hid.h
Simple merge
diff --cc include/uapi/linux/input.h
Simple merge
author	Jiri Kosina <jkosina@suse.cz>
	Wed, 4 Jun 2014 11:09:43 +0000 (13:09 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Wed, 4 Jun 2014 11:09:43 +0000 (13:09 +0200)
		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/leds/Kconfig	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
include/linux/hid.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history
include/uapi/linux/input.h	patch \|	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	blob \| history