Merge branch 'for-linus' of http://people.redhat.com/agk/git/linux-dm
commit6367f1775ebb66b0f0e9e3512159f3257a6fde0e
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Oct 2011 15:31:47 +0000 (6 08:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Oct 2011 15:31:47 +0000 (6 08:31 -0700)
tree113dadfab2a16ab63047a8b350f9facdb5060a82
parenta7c56ebac1bce799b583230595b4de9ccb8162d0
parent983c7db347db8ce2d8453fd1d89b7a4bb6920d56
Merge branch 'for-linus' of 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