Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jul 2012 23:01:20 +0000 (16:01 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jul 2012 23:01:20 +0000 (16:01 -0700)
1  2 
drivers/staging/iio/Documentation/iio_utils.h
drivers/staging/iio/accel/adis16240_core.c
drivers/staging/iio/adc/ad7793.c

Simple merge