tree 460944dab0d8feed1c2338ff1bda4bc60d7660e9
parent cc03bbf1edc87fd4813546e8a8455b6ea6efc4d2
parent d43317dcd074818d4bd12ddd4184a29aff98907b
author Chris Mason <chris.mason@oracle.com> 1320602009 -0500
committer Chris Mason <chris.mason@oracle.com> 1320602009 -0500

Merge branch 'integration' into for-linux-next

Conflicts:
	fs/btrfs/inode.c

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