linux/drivers/iio/temperature
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
..
Kconfig
Makefile
tmp006.c Merge 3.12-rc2 into staging-next. 2013-09-25 08:59:04 -07:00