[ Philip Muškovac ]
* Merge from debian (LP: #894456), remaining changes:
  - 07-allow-fsck-options.patch (updated):
    + Make fsck.btrfs not fail when called with fsck options.
  - btrfs-tools-udeb.install:
    + ship btrfs in the udeb.
  - btrfs-tools.links:
    + Add btrfsck -> fsck.btrfs symlink

[ Dmitrijs Ledkovs ]
* Dropped changes:
  - debian/patches/04-werror.patch - included upstream
  - debian/patches/05-fix-ld.patch - applied in debian
  - 09-unused-warnings.patch - included upstream