Greg Kroah-Hartman 6a2a2cdd57 Merge 3.6-rc6 into staging-next ... This pulls in the staging tree fixes in 3.6-rc6 into our branch to resolve the merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>		2012-09-16 17:17:25 -07:00
..
ad7266.c	iio: Drop timestamp parameter from buffer store_to callback	2012-09-08 10:14:34 +01:00
ad7791.c	staging:iio:adc: Add AD7791 driver	2012-09-08 10:20:09 +01:00
ad_sigma_delta.c	iio: Drop timestamp parameter from buffer store_to callback	2012-09-08 10:14:34 +01:00
at91_adc.c	Merge 3.6-rc6 into staging-next	2012-09-16 17:17:25 -07:00
Kconfig	staging:iio:adc: Add AD7791 driver	2012-09-08 10:20:09 +01:00
Makefile	staging:iio:adc: Add AD7791 driver	2012-09-08 10:20:09 +01:00