tree 4106f63211fed084e674bb69af0779eb5781039e
parent 5e25e4f304ce53004dcd01725938c0bc45c75d35
parent 3955dfa8216f712bc204a5ad2f4e51efff252fde
author Linus Torvalds <torvalds@linux-foundation.org> 1377459855 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1377459855 -0700
mergetag object 3955dfa8216f712bc204a5ad2f4e51efff252fde
 type commit
 tag staging-3.11-rc7
 tagger Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1377454096 -0700
 
 Staging fixes for 3.11-rc7
 
 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.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.21 (GNU/Linux)
 
 iEYEABECAAYFAlIaSHgACgkQMUfUDdst+ykJsACgtiD3G2UFK6hwqvaiVKbT39E7
 pNAAn32Q47GWkTLsrKlIWqOwhpnMb+mi
 =8lmn
 -----END PGP SIGNATURE-----

Merge tag 'staging-3.11-rc7' of git://git.kernel.org/pub/scm/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