git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b1d0598 a485923)

author	Jiri Kosina <jkosina@suse.cz>
	Tue, 24 Feb 2015 20:00:16 +0000 (21:00 +0100)
committer	Jiri Kosina <jkosina@suse.cz>
	Tue, 24 Feb 2015 20:00:16 +0000 (21:00 +0100)
commit	b14f9dc6591fb232d7140589093e7394bc663537
tree	41e7e78610fbaec3bab65e7131b0b9c4b272234e	tree \| snapshot
parent	b1d05987670a0beb5acd65c3c34c6b91c3f3c970	commit \| diff
parent	a485923efbb83056b7fb79e4fd2fee05c990ad5e	commit \| diff

Merge branch 'for-4.1/i2c-hid' into for-next

Conflicts:
drivers/iio/common/hid-sensors/hid-sensor-trigger.c
include/linux/hid-sensor-hub.h

14 files changed:

drivers/hid/hid-core.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-ids.h	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-sensor-hub.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-sony.c	diff1 \|	diff2 \|	blob \| history
drivers/hid/wacom_wac.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/accel/hid-sensor-accel-3d.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/common/hid-sensors/hid-sensor-trigger.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/gyro/hid-sensor-gyro-3d.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/light/hid-sensor-als.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/light/hid-sensor-prox.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/magnetometer/hid-sensor-magn-3d.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/orientation/hid-sensor-incl-3d.c	diff1 \|	diff2 \|	blob \| history
drivers/iio/pressure/hid-sensor-press.c	diff1 \|	diff2 \|	blob \| history
include/linux/hid-sensor-hub.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules