From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 5 May 2014 22:49:38 +0000 (-0700)
Subject: Merge tag 'staging-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: firefly_0821_release~176^2~3946
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a1e74464ffddf47e9a18f99a54242122bfd0997b;p=firefly-linux-kernel-4.4.55.git

Merge tag 'staging-3.15-rc4' of git://git./linux/kernel/git/gregkh/staging

Pull staging / iio fixes from Greg KH:
 "Here are some small IIO driver fixes for 3.15-rc4 that resolve some
  reported issues"

* tag 'staging-3.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  iio: adc: Nothing in ADC should be a bool CONFIG
  iio: exynos_adc: use indio_dev->dev structure to handle child nodes
  iio:imu:mpu6050: Fixed segfault in Invensens MPU driver due to null dereference
  staging:iio:ad2s1200 fix missing parenthesis in a for statment.
---

a1e74464ffddf47e9a18f99a54242122bfd0997b