Merge branch 'dev/control-ioctl' 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)
commitf5bc27c71a1b0741cb93dbec0f216b012b21d93f
treefaff0fa1c1244d603a892525ee1391747c637677
parentfa695b01bceabc40be3267d309ca8a663de53d7a
parentd5131b658c2e906da11603da5d3cb4c3a445331d
Merge branch 'dev/control-ioctl' into for-chris-4.6
fs/btrfs/ctree.h
fs/btrfs/ioctl.c
fs/btrfs/super.c