From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Jul 2011 17:38:18 +0000 (-0700)
Subject: Merge branch 'for-3.1/drivers' of git://git.kernel.dk/linux-block
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8ded371f81fba8b38a049f8c5f30ce6438fc7b75;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branch 'for-3.1/drivers' of git://git.kernel.dk/linux-block

* 'for-3.1/drivers' of git://git.kernel.dk/linux-block:
  cciss: do not attempt to read from a write-only register
  xen/blkback: Add module alias for autoloading
  xen/blkback: Don't let in-flight requests defer pending ones.
  bsg: fix address space warning from sparse
  bsg: remove unnecessary conditional expressions
  bsg: fix bsg_poll() to return POLLOUT properly
---

8ded371f81fba8b38a049f8c5f30ce6438fc7b75