openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/iio
History
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 iio: hid-sensors: Accelerometer 3D: Raw read support 2014-05-05 10:59:49 +01:00
adc Merge 3.15-rc6 into staging-next. 2014-05-22 23:27:17 +09:00
amplifiers iio: amplifiers: ad8366: Remove regulator_put 2013-09-28 11:49:45 +01:00
common iio: hid-sensors: Add API to power on/off 2014-05-05 10:59:49 +01:00
dac iio: dac: ad7303: remove an unneeded check 2014-02-03 21:44:42 +00:00
frequency Merge 3.12-rc6 into staging-next. 2013-10-19 13:14:34 -07:00
gyro iio: hid-sensors: Gyro 3D: Raw read support 2014-05-05 10:59:50 +01:00
humidity iio: Add si7005 relative humidity and temperature sensor driver 2014-01-11 11:12:44 +00:00
imu Merge 3.15-rc6 into staging-next. 2014-05-22 23:27:17 +09:00
light iio: hid-sensors: Proximity: Raw read support 2014-05-05 10:59:51 +01:00
magnetometer iio: hid-sensors: Compass 3D: Raw read support 2014-05-05 10:59:52 +01:00
orientation iio: hid-sensors: Inclinometer 3D: Raw read support 2014-05-05 10:59:52 +01:00
pressure iio: hid-sensors: Pressure: Raw read support 2014-05-05 10:59:53 +01:00
proximity iio: Add AS3935 lightning sensor support 2014-03-16 18:00:32 +00:00
temperature iio: Add Melexis mlx90614 contact-less infrared temperature sensor driver 2014-05-03 11:38:13 +01:00
trigger iio:trigger: fix sysfs name on list mutex 2013-09-28 11:51:16 +01:00
Kconfig iio: Add AS3935 lightning sensor support 2014-03-16 18:00:32 +00:00
Makefile iio: Add AS3935 lightning sensor support 2014-03-16 18:00:32 +00:00
buffer_cb.c iio get rid of unneccessary error_ret 2014-02-18 08:46:36 +00:00
iio_core.h IIO: core: Introduce read_raw_multi 2014-04-29 22:05:32 +01:00
iio_core_trigger.h iio: fix semicolon in io_core_trigger.h 2013-08-03 18:40:32 +01:00
industrialio-buffer.c IIO: core: Modify scan element type 2014-04-29 22:07:11 +01:00
industrialio-core.c iio: Add TEMP_AMBIENT and TEMP_OBJECT channel modifiers 2014-05-03 11:35:23 +01:00
industrialio-event.c IIO: core: Introduce read_raw_multi 2014-04-29 22:05:32 +01:00
industrialio-trigger.c iio get rid of unneccessary error_ret 2014-02-18 08:46:36 +00:00
industrialio-triggered-buffer.c iio:triggered-buffer: Remove redundant call to iio_sw_buffer_preenable(). 2013-10-16 19:12:47 +01:00
inkern.c IIO: core: Introduce read_raw_multi 2014-04-29 22:05:32 +01:00
kfifo_buf.c iio: kfifo_buf: Implement data_available() callback 2013-12-03 20:22:28 +00:00