Merge branch 'loop' of git://ca-git.us.oracle.com/linux-dkleikam-public into ovm...

author Guru Anbalagane <guru.anbalagane@oracle.com>

Fri, 9 Mar 2012 01:35:18 +0000 (17:35 -0800)

committer Guru Anbalagane <guru.anbalagane@oracle.com>

Fri, 9 Mar 2012 01:35:18 +0000 (17:35 -0800)
author Guru Anbalagane <guru.anbalagane@oracle.com>
Fri, 9 Mar 2012 01:35:18 +0000 (17:35 -0800)
committer Guru Anbalagane <guru.anbalagane@oracle.com>
Fri, 9 Mar 2012 01:35:18 +0000 (17:35 -0800)
diff --cc fs/btrfs/file.c
Simple merge
diff --cc fs/btrfs/inode.c
Simple merge
author	Guru Anbalagane <guru.anbalagane@oracle.com>
	Fri, 9 Mar 2012 01:35:18 +0000 (17:35 -0800)
committer	Guru Anbalagane <guru.anbalagane@oracle.com>
	Fri, 9 Mar 2012 01:35:18 +0000 (17:35 -0800)
		1	2
fs/btrfs/file.c	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history