From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 27 Apr 2014 17:34:29 +0000 (-0700)
Subject: Merge tag 'staging-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: firefly_0821_release~176^2~3990
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=d0c15ad760c869f3d676b37c2989baa1566d31f1;p=firefly-linux-kernel-4.4.55.git

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

Pull staging / IIO driver fixes from Greg KH:
 "Here are some small staging and IIO driver fixes for 3.15-rc3.

  Nothing major at all, just some assorted issues that people have
  reported"

* tag 'staging-3.15-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: comedi: usbdux: bug fix for accessing 'ao_chanlist' in private data
  iio: adc: mxs-lradc: fix warning when buidling on avr32
  iio: cm36651: Fix i2c client leak and possible NULL pointer dereference
  iio: querying buffer scan_mask should return 0/1
  staging:iio:ad2s1200 fix a missing break
  iio: adc: at91_adc: correct default shtim value
  ARM: at91: at91sam9260: change at91_adc name
  ARM: at91: at91sam9g45: change at91_adc name
  iio: cm32181: Fix read integration time function
  iio: adc: at91_adc: Repair broken platform_data support
---

d0c15ad760c869f3d676b37c2989baa1566d31f1