git.stricted.de - GitHub/LineageOS/G12/android_kernel_amlogic

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	ec3b34e1975670e68be3abff76f56dbb41dd417c
tree	949f0bb7a3eb9a1f06bb92852b334f17397e4667	tree \| snapshot (tar.gz zip)
parent	817a3125819983956bb8a22455a569aac4e8ea34	commit \| diff
parent	3e48138c2c66d8ff7d96c87a0535cd50078c742f	commit \| diff
parent	181a8b911dd26cd44dc7283d7953a2e138842767	commit \| diff
parent	81bb773faed7f5f0e82f14cdfcfe4e89fbea0e19	commit \| diff
parent	10e87dc42a086c256b25334b6c1c89214feba9a7	commit \| diff
parent	30ee72f0d28721da4bbe2be850fcd0bd269f238f	commit \| diff
parent	6e5e9a06a206010eabd19b523fd0833c51afc0b0	commit \| diff
parent	b2723eb73c6dc014980beb0f3e5f47d6cac57939	commit \| diff
parent	2a6cdbdd4cc0da0b0190b9a43648dff7b44adc0a	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