diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-07-07 22:10:09 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-07-07 22:10:09 +0000 |
| commit | 02aba83b90e12657d14a3d416a72c49ee61ce4ab (patch) | |
| tree | bfe815ae22f410f449e670585c33e3e50497ea7b /debian/patches/series | |
| parent | 049e0bcfa0d21cf2badc0871bbdfca3f1a7de291 (diff) | |
| parent | 5a828b5de3ecb6b65adef7247679a97846d81b3d (diff) | |
Merge branch 'master' into HEAD
Conflicts:
debian/changelog
Diffstat (limited to 'debian/patches/series')
| -rw-r--r-- | debian/patches/series | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/debian/patches/series b/debian/patches/series index 299b9452..2e80be7b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -41,3 +41,18 @@ libmachdev.patch exec_filename_exec.patch exec_filename_fs.patch exec_filename_use.patch + +# Justus Winter's work, to be pushed +mount-n.patch +mount-f.patch +mount-remount.patch +mount-loop.patch +procfs-update.patch +procfs-default.patch +procfs-get-options.patch +sutils-types.patch +mount-test-opts.patch +mount-ignore-mounted-all.patch +mount-t-auto.patch +sutils-multiple-none.patch +umount.patch |