Merge tag 'staging-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2014 03:44:53 +0000 (20:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2014 03:44:53 +0000 (20:44 -0700)
commitb7a68369ea81dfae1416aadf722d830c14ba97c7
treef90cba0d0d82bae2f8e8311a6c9ad7d56fd36134
parentcaa7c4e17259e1ffe28096c9a08409ae939e7c79
parent9359003385a2faffa502d201771d45624037a4cd
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