Greg Kroah-Hartman e2aad1d571 Merge 3.12-rc2 into staging-next. ... This resolves the merge problem with two iio drivers that Stephen Rothwell pointed out. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-09-25 08:59:04 -07:00
..
bma180.c	Merge 3.12-rc2 into staging-next.	2013-09-25 08:59:04 -07:00
hid-sensor-accel-3d.c	iio: Remove unnecessary casts for iio_push_to_buffers()	2013-09-15 19:05:07 +01:00
Kconfig	iio: add Bosch BMA180 acceleration sensor driver	2013-08-28 20:12:22 +01:00
kxsd9.c	iio: accel: kxsd9: Use devm_iio_device_alloc	2013-08-03 18:41:18 +01:00
Makefile	iio: add Bosch BMA180 acceleration sensor driver	2013-08-28 20:12:22 +01:00
st_accel.h	iio: Added ST-sensors platform data to select the DRDY interrupt pin	2013-08-03 18:40:28 +01:00
st_accel_buffer.c	iio:trigger: Introduce iio_tigger_{set,get}_drvdata	2013-03-25 21:06:09 +00:00
st_accel_core.c	iio:accel: Register buffer also without specific trigger	2013-09-21 19:24:07 +01:00
st_accel_i2c.c	iio: accel: st_accel: Use devm_iio_device_alloc	2013-08-03 18:41:18 +01:00
st_accel_spi.c	iio: accel: st_accel: Use devm_iio_device_alloc	2013-08-03 18:41:18 +01:00