kernel-ark/drivers/staging/iio
Greg Kroah-Hartman 69c1f05379 Merge 3.15-rc6 into staging-next.
This resolves the conflicts in the files:
	drivers/iio/adc/Kconfig
	drivers/staging/rtl8723au/os_dep/usb_ops_linux.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-22 23:27:17 +09:00
..
accel Staging: iio/accel: Fix Prefer netdev_warn(netdev, ...then dev_warn(dev, ... then pr_warn(... to printk(KERN_INFO ... in sca3000_ring.c 2014-03-07 14:48:47 -08:00
adc staging: iio: Fix format string mismatch in ad7280a.c 2014-04-30 21:56:12 +01:00
addac First round of IIO new driver, functionality and cleanups for the 3.16 cycle. 2014-04-26 08:12:25 -07:00
cdc staging: iio: Fix typo in iio 2014-04-23 21:44:41 +01:00
Documentation staging: iio: Add tool to list IIO devices and triggers 2014-02-15 11:14:21 +00:00
frequency staging:iio:ad9834: Mark transfer buffers as __b16 2013-12-03 20:22:29 +00:00
gyro staging: iio: adis16060: Use devm_iio_device_register 2013-11-24 21:07:21 +00:00
impedance-analyzer staging:iio:impedance:ad5933: correct error check 2014-01-01 12:19:17 +00:00
light Staging: iio: Switch from msleep to usleep range per timers-howto.txt 2014-04-14 08:29:29 -07:00
magnetometer 2nd round of new IIO drivers, features and cleanups for the 3.14 cycle. 2013-12-24 10:30:57 -08:00
meter spi: Updates for v3.13 2013-11-12 15:01:39 +09:00
resolver staging:iio:ad2s1200 fix missing parenthesis in a for statment. 2014-04-26 10:51:14 +01:00
trigger staging: iio: fix coding style 2014-04-14 08:29:28 -07:00
iio_dummy_evgen.c
iio_dummy_evgen.h
iio_simple_dummy_buffer.c staging:iio:simple-dummy: Remove redundant call to iio_sw_buffer_preenable() 2013-10-16 19:15:40 +01:00
iio_simple_dummy_events.c staging:iio:simple_dummy: Switch to new event config interface 2013-10-12 12:48:39 +01:00
iio_simple_dummy.c iio: Remove support for the legacy event config interface 2013-12-08 13:13:52 +00:00
iio_simple_dummy.h staging:iio:simple_dummy: Switch to new event config interface 2013-10-12 12:48:39 +01:00
Kconfig staging:iio:dummy fix kfifo_buf kconfig dependency issue if kfifo modular and buffer enabled for built in dummy driver. 2013-09-18 19:43:23 +01:00
Makefile
ring_hw.h
TODO Staging/iio: add TODO reminder 2013-10-01 16:19:17 +01:00