]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'stable/for-jens-3.2' into linux-next
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 9 Aug 2011 17:05:24 +0000 (13:05 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Tue, 9 Aug 2011 17:05:24 +0000 (13:05 -0400)
* stable/for-jens-3.2:
  xen/blk[front|back]: Implement the full FLUSH | FUA support.
  cciss: add transport mode attribute to sys
  cciss: Adds simple mode functionality


Trivial merge