From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 Mar 2017 18:02:00 +0000 (-0700)
Subject: Merge tag 'staging-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v4.14-rc1~1231
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=53b4d5911d6adef3f543e1ad23643068c5c343ac;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'staging-4.11-rc4' of git://git./linux/kernel/git/gregkh/staging

Pull IIO driver fixes from Greg KH:
 "Here are some small IIO driver fixes for 4.11-rc4 that resolve a
  number of tiny reported issues. All of these have been in linux-next
  for a while with no reported issues"

* tag 'staging-4.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  iio: imu: st_lsm6dsx: fix FIFO_CTRL2 overwrite during watermark configuration
  iio: adc: ti_am335x_adc: fix fifo overrun recovery
  iio: sw-device: Fix config group initialization
  iio: magnetometer: ak8974: remove incorrect __exit markups
  iio: hid-sensor-trigger: Change get poll value function order to avoid sensor properties losing after resume from S3
---

53b4d5911d6adef3f543e1ad23643068c5c343ac