Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...

author Chuck Anderson <chuck.anderson@oracle.com>

Wed, 10 Aug 2016 21:32:10 +0000 (14:32 -0700)

committer Chuck Anderson <chuck.anderson@oracle.com>

Wed, 10 Aug 2016 21:32:10 +0000 (14:32 -0700)
author Chuck Anderson <chuck.anderson@oracle.com>
Wed, 10 Aug 2016 21:32:10 +0000 (14:32 -0700)
committer Chuck Anderson <chuck.anderson@oracle.com>
Wed, 10 Aug 2016 21:32:10 +0000 (14:32 -0700)
diff --cc fs/btrfs/ioctl.c
Simple merge
diff --cc fs/btrfs/tree-log.c
Simple merge
author	Chuck Anderson <chuck.anderson@oracle.com>
	Wed, 10 Aug 2016 21:32:10 +0000 (14:32 -0700)
committer	Chuck Anderson <chuck.anderson@oracle.com>
	Wed, 10 Aug 2016 21:32:10 +0000 (14:32 -0700)
		1	2
fs/btrfs/ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/tree-log.c	patch \|	diff1 \|	diff2 \|	blob \| history