From: Chris Mason <chris.mason@oracle.com>
Date: Sun, 22 May 2011 11:07:01 +0000 (-0400)
Subject: Merge branch 'delayed_inode' into inode_numbers
X-Git-Tag: v3.0-rc1~38^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcc6d073225b6b732a52477c91bd4edc9b4d5502;p=pandora-kernel.git

Merge branch 'delayed_inode' into inode_numbers

Conflicts:
	fs/btrfs/inode.c
	fs/btrfs/ioctl.c
	fs/btrfs/transaction.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>
---

dcc6d073225b6b732a52477c91bd4edc9b4d5502
Reading git-diff-tree failed