From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 11 Oct 2011 19:05:32 +0000 (-0400)
Subject: Merge branch 'stable/for-jens-3.2' into linux-next
X-Git-Tag: next-20111012~16^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9fda08fac20480d18a27daed4ff3ff995a7cbc11;p=karo-tx-linux.git

Merge branch 'stable/for-jens-3.2' into linux-next

* stable/for-jens-3.2:
  xen/blk[front|back]: Enhance discard support with secure erasing support.
  xen/blkback: Fix the inhibition to map pages when discarding sector ranges.
  xen/blkback: Support 'feature-barrier' aka old-style BARRIER requests.
  xen/blkback: Report VBD_WSECT (wr_sect) properly.
---

9fda08fac20480d18a27daed4ff3ff995a7cbc11