Merge branch '3.2' into 3.3

2017-01-29 00:54:04 +01:00 · 2017-01-29 00:54:04 +01:00 · d147a0120c
commit d147a0120c
parent a34a2649e2 78d0d0e8ff
4 changed files with 3 additions and 3 deletions
--- a/btrfs-progs/.md5sum
+++ b/btrfs-progs/.md5sum
@ -1,2 +1,2 @@
-7b4cf377e55afb43f2c89b375e380b73  btrfs-progs-man-v4.9.tar.xz
-5ba59ab2cf6d35a86920ab439bc99cb8  btrfs-progs-v4.9.tar.xz
+3a6bf6315ccc985fc65c9f7b15fa5d76  btrfs-progs-man-v4.9.1.tar.xz
+c236c632b9d1928c592e81fb543afe0f  btrfs-progs-v4.9.1.tar.xz
--- a/btrfs-progs/Pkgfile
+++ b/btrfs-progs/Pkgfile
@ -4,7 +4,7 @@
 # Depends on:  util-linux e2fsprogs lzo zlib

 name=btrfs-progs
-version=4.9
+version=4.9.1
 release=1
 source=(https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$version.tar.xz \
        $name-man-v$version.tar.xz)
--- a/btrfs-progs/btrfs-progs-man-v4.9.1.tar.xz
+++ b/btrfs-progs/btrfs-progs-man-v4.9.1.tar.xz
--- a/btrfs-progs/btrfs-progs-man-v4.9.tar.xz
+++ b/btrfs-progs/btrfs-progs-man-v4.9.tar.xz