Merge branch '3.2' into 3.3

2016-10-22 23:25:32 +02:00 · 2016-10-22 23:25:32 +02:00 · a59c78dd3d
commit a59c78dd3d
parent 4cb31c4f99 5539f6bfd7
4 changed files with 3 additions and 3 deletions
--- a/btrfs-progs/.md5sum
+++ b/btrfs-progs/.md5sum
@ -1,2 +1,2 @@
-506468b6fd2d86b7a3b82911b4dcbc9a  btrfs-progs-man-v4.7.3.tar.xz
-b2dc5175a721247d982be6d98e1e7525  btrfs-progs-v4.7.3.tar.xz
+d43e0eb08941f29896d160e4bf3edeb7  btrfs-progs-man-v4.8.1.tar.xz
+127e109ed05274597d67c24c89861d49  btrfs-progs-v4.8.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.7.3
+version=4.8.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.7.3.tar.xz
+++ b/btrfs-progs/btrfs-progs-man-v4.7.3.tar.xz
--- a/btrfs-progs/btrfs-progs-man-v4.8.1.tar.xz
+++ b/btrfs-progs/btrfs-progs-man-v4.8.1.tar.xz