]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-jens-3.2' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 12 Oct 2011 22:17:28 +0000 (18:17 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Wed, 12 Oct 2011 22:17:28 +0000 (18:17 -0400)
* stable/for-jens-3.2:
  xen/blkback: Fix the inhibition to map pages when discarding sector ranges.
  xen/blkback: Report VBD_WSECT (wr_sect) properly.
  xen/blkback: Support 'feature-barrier' aka old-style BARRIER requests.

1  2 
drivers/block/xen-blkback/blkback.c
drivers/block/xen-blkback/xenbus.c

Simple merge
Simple merge