Merge branch 'misc-4.6' into for-chris-4.6
authorDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
committerDavid Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
commitfa695b01bceabc40be3267d309ca8a663de53d7a
tree017a66e7b0c2d928d3edc9531cf04bd3debf346a
parentf004fae0cfeb96d33240eb5471f14cb6fbbd4eea
parentf7e98a7fff8634ae655c666dc2c9fc55a48d0a73
Merge branch 'misc-4.6' into for-chris-4.6

# Conflicts:
# fs/btrfs/file.c
fs/btrfs/ctree.h
fs/btrfs/file.c
fs/btrfs/ioctl.c