Merge "iio: adc: rradc: Add RRADC channels"

author Linux Build Service Account <lnxbuild@localhost>

Wed, 3 Aug 2016 11:58:23 +0000 (04:58 -0700)

committer Gerrit - the friendly Code Review server <code-review@localhost>

Wed, 3 Aug 2016 11:58:22 +0000 (04:58 -0700)
author Linux Build Service Account <lnxbuild@localhost>
Wed, 3 Aug 2016 11:58:23 +0000 (04:58 -0700)
committer Gerrit - the friendly Code Review server <code-review@localhost>
Wed, 3 Aug 2016 11:58:22 +0000 (04:58 -0700)
diff --cc arch/arm/boot/dts/qcom/msm-pmicobalt.dtsi
Simple merge
author	Linux Build Service Account <lnxbuild@localhost>
	Wed, 3 Aug 2016 11:58:23 +0000 (04:58 -0700)
committer	Gerrit - the friendly Code Review server <code-review@localhost>
	Wed, 3 Aug 2016 11:58:22 +0000 (04:58 -0700)