Greg Kroah-Hartman 8f5f90a872 Merge 3.8-rc5 into staging-next ... This resolves a merge issue with a iio driver, and the zram code. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2013-01-25 21:25:02 -08:00
..
adis16136.c	iio: gyro: adis16136: remove duplicated include from adis16136.c	2012-11-30 13:11:46 +00:00
hid-sensor-gyro-3d.c	Merge 3.8-rc5 into staging-next	2013-01-25 21:25:02 -08:00
Kconfig	iio: hid-sensors: respect CONFIG_IIO_TRIGGER	2012-12-27 10:59:50 +00:00
Makefile	iio:gyro: Add support for the ADIS16136 gyroscope	2012-11-20 21:26:34 +00:00