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

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

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4705c0a 276d10f)

author	Jiri Kosina <jkosina@suse.cz>
	Mon, 13 Apr 2015 21:43:34 +0000 (23:43 +0200)
committer	Jiri Kosina <jkosina@suse.cz>
	Mon, 13 Apr 2015 21:43:34 +0000 (23:43 +0200)
commit	49d92eaa429a54bd8ab1e075a26445e73027035e
tree	3fd892aeae61b105e3c5c979550aabf54109a656	tree \| snapshot
parent	4705c0a1ccadcd8a6a6a028918724fe1fb9268a6	commit \| diff
parent	276d10fa5caba83b8c13a90f60ee5f65f3b09c9e	commit \| diff

Merge branch 'for-4.1/sensor-hub' into for-linus

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

12 files changed:

drivers/hid/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/hid/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/hid/hid-sensor-hub.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 Source Tree.