Merge tag 'staging-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging tree fixes from Greg KH: "Here are a few IIO fixes, and a new device id for a staging driver for 3.14-rc5. All have been in linux-next for a while, I did a final merge to get the IIO fixes into this tree, they were incorrectly in the char-misc tree for a few weeks, and I forgot to tell you to pull them from there. This makes it a single pull request for you" * tag 'staging-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: staging: r8188eu: Add new device ID staging:iio:adc:MXS:LRADC: fix touchscreen statemachine iio:gyro: bug on L3GD20H gyroscope support iio: cm32181: Change cm32181 ambient light sensor driver iio: cm36651: Fix read/write integration time function.
Showing
- drivers/iio/gyro/Kconfig 1 addition, 1 deletiondrivers/iio/gyro/Kconfig
- drivers/iio/gyro/st_gyro.h 0 additions, 1 deletiondrivers/iio/gyro/st_gyro.h
- drivers/iio/gyro/st_gyro_core.c 4 additions, 5 deletionsdrivers/iio/gyro/st_gyro_core.c
- drivers/iio/gyro/st_gyro_i2c.c 0 additions, 1 deletiondrivers/iio/gyro/st_gyro_i2c.c
- drivers/iio/gyro/st_gyro_spi.c 0 additions, 1 deletiondrivers/iio/gyro/st_gyro_spi.c
- drivers/iio/light/cm32181.c 8 additions, 8 deletionsdrivers/iio/light/cm32181.c
- drivers/iio/light/cm36651.c 23 additions, 22 deletionsdrivers/iio/light/cm36651.c
- drivers/staging/iio/adc/mxs-lradc.c 1 addition, 0 deletionsdrivers/staging/iio/adc/mxs-lradc.c
- drivers/staging/rtl8188eu/os_dep/usb_intf.c 1 addition, 0 deletionsdrivers/staging/rtl8188eu/os_dep/usb_intf.c
Please register or sign in to comment