Merge branch 'for-linus' of http://people.redhat.com/agk/git/linux-dm
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Oct 2011 15:31:47 +0000 (08:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Oct 2011 15:31:47 +0000 (08:31 -0700)
* 'for-linus' of http://people.redhat.com/agk/git/linux-dm:
  dm crypt: always disable discard_zeroes_data
  dm: raid fix write_mostly arg validation
  dm table: avoid crash if integrity profile changes
  dm: flakey fix corrupt_bio_byte error path


Trivial merge