git.baikalelectronics.ru Git - kernel.git/commit

author	Jiri Kosina <jkosina@suse.cz>
	Mon, 22 Jun 2015 14:23:43 +0000 (16:23 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Mon, 22 Jun 2015 14:23:43 +0000 (16:23 +0200)
commit	f4e702361f4fd1ed2568779fc6bfede1cdea32d1
tree	949f0bb7a3eb9a1f06bb92852b334f17397e4667	tree \| snapshot
parent	ef5d40abb2fe31fae71e9b6e5feb862edbf0455b	commit \| diff
parent	147db84c243bfffbf8c491215a3eaece359d4d1c	commit \| diff
parent	13b0c50ad23136678ca61809564d3aa61ab8b24a	commit \| diff
parent	3567d654e156445e0417275901a1bf28d98ab64c	commit \| diff
parent	e586de50ba88ee58ba16a23b75f97c4a0bc4721a	commit \| diff
parent	e7b6b90a08efd33e5e2f0abe4a9650837785a7b7	commit \| diff
parent	1c36fcdf63f66b496ad0ac00480e9202f22749af	commit \| diff
parent	4760bf9f90a2f3f942b5a81959a0e43f99e88467	commit \| diff
parent	4da524e0b597a76c7c91f9aebfec6a600cdd5216	commit \| diff

Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus

Conflicts:
drivers/hid/wacom_wac.c

MAINTAINERS	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/hid/hid-core.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/hid/hid-lenovo.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/hid/hid-rmi.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/hid/i2c-hid/i2c-hid.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/hid/usbhid/hid-quirks.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history
drivers/hid/wacom_wac.c	diff1 \|	diff2 \|	diff3 \|	diff4 \|	diff5 \|	diff6 \|	diff7 \|	diff8 \|	diff9 \|	blob \| history