Merge tag 'staging-4.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Jan 2018 22:04:06 +0000 (14:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Jan 2018 22:04:06 +0000 (14:04 -0800)
commitd5a047fd92c6e0db7d56b9e20200cc30f6c7c8e2
tree229f38b29f90efa6a300aadbd25ee3d27ba131ec
parent9e8f8f1ef4f804b8fd81beaa8afa9cbe0f175935
parent443064cb0b1fb4569fe0a71209da7625129fb760
Merge tag 'staging-4.15-rc8' of git://git./linux/kernel/git/gregkh/staging

Pull staging driver fix from Greg KH:
 "Here is a single android ashmem bugfix that resolves a reported issue
  in that interface. It's been in linux-next this week with no reported
  issues"

* tag 'staging-4.15-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: android: ashmem: fix a race condition in ASHMEM_SET_SIZE ioctl