Skip to content
Commit 2e455c27 authored by Jiri Kosina's avatar Jiri Kosina
Browse files

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
parents 05f6d025 b2eafd72
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment