summaryrefslogtreecommitdiff
path: root/debian/patches/10_cdromlock.patch
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2012-11-19 16:55:41 +0100
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2012-11-19 16:55:41 +0100
commit4aabe7e914ddcf1b4109fa96381a920ea5a097c9 (patch)
treeb1f9ccbb077ce666715fa46000c86b79592d7941 /debian/patches/10_cdromlock.patch
parenta75a4ae1ad81da72a199b46a8a82e6b06c54d0c1 (diff)
mark as merged upstream
Diffstat (limited to 'debian/patches/10_cdromlock.patch')
-rw-r--r--debian/patches/10_cdromlock.patch2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/patches/10_cdromlock.patch b/debian/patches/10_cdromlock.patch
index 436f97c..6401fc8 100644
--- a/debian/patches/10_cdromlock.patch
+++ b/debian/patches/10_cdromlock.patch
@@ -1,3 +1,5 @@
+merged upstream
+
Index: b/linux/dev/glue/block.c
===================================================================
--- a/linux/dev/glue/block.c