Merge branch '3.2' into 3.3

2016-11-24 19:23:40 +01:00 · 2016-11-24 19:23:40 +01:00 · 09abe203e6
commit 09abe203e6
parent 231d9b4d21 5f706c97d4
4 changed files with 3 additions and 3 deletions
--- a/btrfs-progs/.md5sum
+++ b/btrfs-progs/.md5sum
@ -1,2 +1,2 @@
-dafb34355455bef639201b7aaaf2b12f  btrfs-progs-man-v4.8.2.tar.xz
-903f87886a7810a6819e8db915e4ec29  btrfs-progs-v4.8.2.tar.xz
+bc75634dd5ab56afe3a9278e6fb711c6  btrfs-progs-man-v4.8.3.tar.xz
+bafbd73850ddb48170122dc1276d8f11  btrfs-progs-v4.8.3.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.8.2
+version=4.8.3
 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.8.2.tar.xz
+++ b/btrfs-progs/btrfs-progs-man-v4.8.2.tar.xz
--- a/btrfs-progs/btrfs-progs-man-v4.8.3.tar.xz
+++ b/btrfs-progs/btrfs-progs-man-v4.8.3.tar.xz