tree 796fd3c878a2f8d8d55ea1e52ef236742a48c3dd
parent 8a392625b665c676a77c62f8608d10ff430bcb83
parent d41e26b901111f4e540aa2c27ec7a1681c782be9
author Linus Torvalds <torvalds@linux-foundation.org> 1216661410 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1216661410 -0700

Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:
  dm crypt: add merge
  dm table: remove merge_bvec sector restriction
  dm: linear add merge
  dm: introduce merge_bvec_fn
  dm snapshot: use per device mempools
  dm snapshot: fix race during exception creation
  dm snapshot: track snapshot reads
  dm mpath: fix test for reinstate_path
  dm mpath: return parameter error
  dm io: remove struct padding
  dm log: make dm_dirty_log init and exit static
  dm mpath: free path selector on invalid args