Merge branch 'quilt/device-mapper'

diff --cc drivers/md/dm-crypt.c
Simple merge

diff --cc drivers/md/dm-kcopyd.c
Simple merge

diff --cc drivers/md/dm-mpath.c
index c3547016f0f1e7156d1b28b0fded62b5bf534008,545f125b665436840a596b8328237aec1925fd17..bba5a6e0f9eea42bb59317d6e73757326167d495
--- 1/drivers/md/dm-mpath.c
--- 2/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@@ -19,10 -19,9 +19,9 @@@
  #include <linux/time.h>
  #include <linux/workqueue.h>
  #include <scsi/scsi_dh.h>
 -#include <asm/atomic.h>
 +#include <linux/atomic.h>
  
  #define DM_MSG_PREFIX "multipath"
- #define MESG_STR(x) x, sizeof(x)
  #define DM_PG_INIT_DELAY_MSECS 2000
  #define DM_PG_INIT_DELAY_DEFAULT ((unsigned) -1)
  

diff --cc drivers/md/dm-table.c
Simple merge