Merge branch 'dev/control-ioctl' into for-chris-4.6

author David Sterba <dsterba@suse.com>

Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)

committer David Sterba <dsterba@suse.com>

Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
author David Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
committer David Sterba <dsterba@suse.com>
Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
diff --cc fs/btrfs/ctree.h
Simple merge
diff --cc fs/btrfs/ioctl.c
Simple merge
diff --cc fs/btrfs/super.c
Simple merge
author	David Sterba <dsterba@suse.com>
	Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
committer	David Sterba <dsterba@suse.com>
	Fri, 26 Feb 2016 14:38:34 +0000 (15:38 +0100)
		1	2
fs/btrfs/ctree.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/super.c	patch \|	diff1 \|	diff2 \|	blob \| history