Merge branch 'fixes-togreg' into togreg
authorJonathan Cameron <jic23@kernel.org>
Sat, 30 Jun 2012 09:14:29 +0000 (10:14 +0100)
committerJonathan Cameron <jic23@kernel.org>
Sat, 30 Jun 2012 09:14:29 +0000 (10:14 +0100)
commitc1f1a9d48fd18cd380858637fda1c69732547e1f
treea0973498293f0f10d448021d7192889db9a956ee
parent2da049bd5f9b0dbd688519fdb6688a4895fe8395
parent06d5199d4c53615338d0453b62458cd82fb88f33
Merge branch 'fixes-togreg' into togreg
drivers/staging/iio/Documentation/iio_utils.h
drivers/staging/iio/accel/adis16240_core.c
drivers/staging/iio/adc/ad7793.c