Skip to content
  • Linus Torvalds's avatar
    Merge tag 'staging-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · c6e6e58c
    Linus Torvalds authored
    Pull staging and IIO driver fixes from Greg KH:
     "Here are some IIO driver fixes, along with two staging driver fixes
      for 4.6-rc3.
    
      One staging driver patch reverts the deletion of a driver that
      happened in 4.6-rc1.  We thought that laptop.org was dead, but it's
      still alive and kicking, and has users that were mad we broke their
      hardware by deleting a driver for their machines.  So that driver is
      added back and everyone is happy again.
    
      All of these have been in linux-next for a while with no reported
      issues"
    
    * tag 'staging-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
      Revert "Staging: olpc_dcon: Remove obsolete driver"
      staging/rdma/hfi1: select CRC32
      iio: gyro: bmg160: fix buffer read values
      iio: gyro: bmg160: fix endianness when reading axes
      iio: accel: bmc150: fix endianness when reading axes
      iio: st_magn: always define ST_MAGN_TRIGGER_SET_STATE
      iio: fix config watermark initial value
      iio: health: max30100: correct FIFO check condition
      iio: imu: Fix inv_mpu6050 dependencies
      iio: adc: Fix build error of missing devm_ioremap_resource on UM
      iio: light: apds9960: correct FIFO check condition
      iio: adc: max1363: correct reference voltage
      iio: adc: max1363: add missing adc to max1363_id
    c6e6e58c