From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 21 Jul 2014 03:44:53 +0000 (-0700)
Subject: Merge tag 'staging-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: firefly_0821_release~176^2~3579
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b7a68369ea81dfae1416aadf722d830c14ba97c7;p=firefly-linux-kernel-4.4.55.git

Merge tag 'staging-3.16-rc6' of git://git./linux/kernel/git/gregkh/staging

Pull more IIO driver fixes from Greg KH:
 "Here are two IIO driver fixes for 3.16-rc6 that resolve some reported
  issues"

* tag 'staging-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  iio: mma8452: Use correct acceleration units.
  iio:core: Handle error when mask type is not separate
---

b7a68369ea81dfae1416aadf722d830c14ba97c7