The following commit has been merged in the linux branch: commit 1b7607030df6908901250b5d7de03ba74cca7d67 Merge: 04bf7539c08d64184736cdc5e4ad617eda77eb0f c1cc65caa19bb8a1b2e371000ef2719581db1691 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Oct 22 08:25:36 2009 +0900

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 snapshot: allow chunk size to be less than page size dm snapshot: use unsigned integer chunk size dm snapshot: lock snapshot while supplying status dm exception store: fix failed set_chunk_size error path dm snapshot: require non zero chunk size by end of ctr dm: dec_pending needs locking to save error value dm: add missing del_gendisk to alloc_dev error path dm log: userspace fix incorrect luid cast in userspace_ctr dm snapshot: free exception store on init failure dm snapshot: sort by chunk size to fix race