tree 113dadfab2a16ab63047a8b350f9facdb5060a82
parent a7c56ebac1bce799b583230595b4de9ccb8162d0
parent 983c7db347db8ce2d8453fd1d89b7a4bb6920d56
author Linus Torvalds <torvalds@linux-foundation.org> 1317915107 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317915107 -0700

Merge branch 'for-linus' of http://people.redhat.com/agk/git/linux-dm

* '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