]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge tag 'staging-3.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Aug 2013 19:44:15 +0000 (12:44 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 25 Aug 2013 19:44:15 +0000 (12:44 -0700)
commitc1c008cc55ab917923871db6bb461b903e9e1f76
tree4106f63211fed084e674bb69af0779eb5781039e
parent5e25e4f304ce53004dcd01725938c0bc45c75d35
parent3955dfa8216f712bc204a5ad2f4e51efff252fde
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