From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 25 Aug 2013 19:44:15 +0000 (-0700)
Subject: Merge tag 'staging-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: drm-fsl-dcu-for-next~6950
X-Git-Url: http://git.agner.ch/gitweb/?a=commitdiff_plain;h=c1c008cc55ab917923871db6bb461b903e9e1f76;p=linux-drm-fsl-dcu.git

Merge tag 'staging-3.11-rc7' of git://git./linux/kernel/git/gregkh/staging

Pull staging fixes from Greg KH:
 "Here are two tiny staging tree fixes (well, one is for an iio driver,
  but those updates come through the staging tree due to dependancies)

  One fixes a problem with an IIO driver, and the other fixes a bug in
  the comedi driver core"

* tag 'staging-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: comedi: bug-fix NULL pointer dereference on failed attach
  iio: adjd_s311: Fix non-scan mode data read
---

c1c008cc55ab917923871db6bb461b903e9e1f76