Merge remote-tracking branch 'btrfs/next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 2 Oct 2012 00:25:53 +0000 (10:25 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Tue, 2 Oct 2012 00:25:53 +0000 (10:25 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 00:25:53 +0000 (10:25 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 2 Oct 2012 00:25:53 +0000 (10:25 +1000)
diff --cc fs/btrfs/ctree.h
Simple merge
diff --cc fs/btrfs/inode.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 2 Oct 2012 00:25:53 +0000 (10:25 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 2 Oct 2012 00:25:53 +0000 (10:25 +1000)
		1	2
fs/btrfs/ctree.h	patch \|	diff1 \|	diff2 \|	blob \| history
fs/btrfs/inode.c	patch \|	diff1 \|	diff2 \|	blob \| history