From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 2 Mar 2014 23:12:54 +0000 (-0800)
Subject: Merge tag 'staging-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v3.14-rc5~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ff7aeb6247823e51b04d993478025f4591b9679;p=profile%2Fcommon%2Fkernel-common.git

Merge tag 'staging-3.14-rc5' of git://git./linux/kernel/git/gregkh/staging

Pull staging tree fixes from Greg KH:
 "Here are a few IIO fixes, and a new device id for a staging driver for
  3.14-rc5.  All have been in linux-next for a while, I did a final
  merge to get the IIO fixes into this tree, they were incorrectly in
  the char-misc tree for a few weeks, and I forgot to tell you to pull
  them from there.  This makes it a single pull request for you"

* tag 'staging-3.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: r8188eu: Add new device ID
  staging:iio:adc:MXS:LRADC: fix touchscreen statemachine
  iio:gyro: bug on L3GD20H gyroscope support
  iio: cm32181: Change cm32181 ambient light sensor driver
  iio: cm36651: Fix read/write integration time function.
---

9ff7aeb6247823e51b04d993478025f4591b9679