From 0e137718f537d00c505f76efa40afc3471dfd8ff Mon Sep 17 00:00:00 2001
From: Mikulas Patocka <mpatocka@redhat.com>
Date: Fri, 1 Mar 2013 22:45:47 +0000
Subject: [PATCH] --- yaml --- r: 360319 b: refs/heads/master c:
 23cb21092eb9dcec9d3604b68d95192b79915890 h: refs/heads/master i:   360317:
 063d28c3646fb4de7cbb56e524b7419924ea7c10   360315:
 c2ac3c875cbd55e6f30872ba5c16883f2cb92a71   360311:
 df63824fec9bb4855ebf19afedefb8ff7b3621a7   360303:
 98e7d95136bcff935840951f93a425ca9dfecdab   360287:
 eb03cc033b224c9a3cc399cfa21b80f3847a2fd4   360255:
 9529f0b250597e528cd46623b7109da577809509   360191:
 efb9466eaf5c9fa72270c8b62b589734300572da v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/md/dm-snap.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 2654ffbfc584..0c2448f98ee2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 018cede93c987273071aed153b6d207e0af5e868
+refs/heads/master: 23cb21092eb9dcec9d3604b68d95192b79915890
diff --git a/trunk/drivers/md/dm-snap.c b/trunk/drivers/md/dm-snap.c
index 5d78027e07ac..58c2b5881377 100644
--- a/trunk/drivers/md/dm-snap.c
+++ b/trunk/drivers/md/dm-snap.c
@@ -2302,3 +2302,5 @@ module_exit(dm_snapshot_exit);
 MODULE_DESCRIPTION(DM_NAME " snapshot target");
 MODULE_AUTHOR("Joe Thornber");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("dm-snapshot-origin");
+MODULE_ALIAS("dm-snapshot-merge");