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