Merge tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Mar 2014 01:58:27 +0000 (18:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Mar 2014 01:58:27 +0000 (18:58 -0700)
commita491ce72f8610c4a675baa45f5572886a2436959
treee23adf579497972d30799609ac05750a43a1011d
parent979e0d74651ba5aa533277f2a6423d0f982fb6f6
parent084b6e7765b9554699afa23a50e702a3d0ae4b24
Merge tag 'staging-3.15-rc6' of git://git./linux/kernel/git/gregkh/staging

Pull staging driver tree fix from Greg KH:
 "Here is a single staging driver fix for your tree.

  It resolves an issue with arbritary writes to memory if a specific
  driver is loaded"

* tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging/cxt1e1/linux.c: Correct arbitrary memory write in c4_ioctl()