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	d083687177ae42e9bb9624348a8802b93850c1bc
tree	949f0bb7a3eb9a1f06bb92852b334f17397e4667	tree \| snapshot
parent	d00391e5fcc6f220574e6df4b1082a84b9da315b	commit \| diff
parent	57f7ec485a5386e822269ae75b49330918eccc0a	commit \| diff
parent	96c1f247b3cc5469102491a7eeba6c4f02c0a929	commit \| diff
parent	80f52ce5b06b5e7dce5a6d4a08f596474a49cac2	commit \| diff
parent	087e38d6389c27c3c27d40743adbed11b7b4858f	commit \| diff
parent	4bbc5f35005a3072dd60cae5ccd32aa514155c62	commit \| diff
parent	f076f9830505573217a049f93856c82a436c34f9	commit \| diff
parent	6b9a827301c7c425ae2ca55e9c202f6b8f59c5fa	commit \| diff
parent	52ed239068c7f228cc906b50b55d80c7bf94efee	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