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
..
hid-sensor-incl-3d.c	Merge branch 'for-4.1/sensor-hub' into for-linus	2015-04-13 23:43:34 +02:00
hid-sensor-rotation.c	iio: remove .owner field for driver using module_platform_driver	2014-08-26 21:08:38 +01:00
Kconfig
Makefile