Jiri Kosina 2e455c27bd 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

2015-04-13 23:43:34 +02:00

8.6 KiB

Raw Blame History

View Raw