Merge branch 'bug-fixes' of git://repo.or.cz/linux-btrfs-devel into btrfs-38

author Chris Mason <chris.mason@oracle.com>

Fri, 28 Jan 2011 21:24:59 +0000 (16:24 -0500)

committer Chris Mason <chris.mason@oracle.com>

Fri, 28 Jan 2011 21:24:59 +0000 (16:24 -0500)
author Chris Mason <chris.mason@oracle.com>
Fri, 28 Jan 2011 21:24:59 +0000 (16:24 -0500)
committer Chris Mason <chris.mason@oracle.com>
Fri, 28 Jan 2011 21:24:59 +0000 (16:24 -0500)
diff --cc fs/btrfs/acl.c
Simple merge
diff --cc fs/btrfs/disk-io.c
Simple merge
diff --cc fs/btrfs/inode.c
Simple merge
diff --cc fs/btrfs/ioctl.c
Simple merge
diff --cc fs/btrfs/super.c
Simple merge
author	Chris Mason <chris.mason@oracle.com>
	Fri, 28 Jan 2011 21:24:59 +0000 (16:24 -0500)
committer	Chris Mason <chris.mason@oracle.com>
	Fri, 28 Jan 2011 21:24:59 +0000 (16:24 -0500)
		1	2
fs/btrfs/acl.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/disk-io.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/ioctl.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/super.c	patch \|	diff1 \|	diff2 \|	blob \| history