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

Browse source

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

...

This commit is contained in:

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

parent 05f6d02521 b2eafd7282

commit 2e455c27bd

17 changed files with 1154 additions and 110 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

55

include/linux/hid-sensor-hub.h

View file

2

include/linux/hid-sensor-ids.h

View file