summaryrefslogtreecommitdiff
path: root/init/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-09 22:09:37 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-09 22:09:37 +0300
commitc6e6e58cc8a636b9b833a7b4bc00cde1fe20892f (patch)
tree7be28c37bb733b163001dbb47a2f49b739cda794 /init/Kconfig
parentfb41b4be00270f5b28784a31a458a4dcf4519b9e (diff)
parent53c43c5ca13328ac8f415aa2251791b441a12b51 (diff)
downloadlinux-c6e6e58cc8a636b9b833a7b4bc00cde1fe20892f.tar.xz
Merge tag 'staging-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
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
Diffstat (limited to 'init/Kconfig')
0 files changed, 0 insertions, 0 deletions