refs/heads/next-merged - pub/scm/linux/kernel/git/mason/linux-test

commit: b223e7bce2ae6982fd6da6156e01ac52a267a94c
[log] [tgz]
author: Chris Mason <chris.mason@oracle.com>
Sun Nov 06 12:53:29 2011 -0500
committer: Chris Mason <chris.mason@oracle.com>
Sun Nov 06 12:53:29 2011 -0500
tree: 460944dab0d8feed1c2338ff1bda4bc60d7660e9
parent: cc03bbf1edc87fd4813546e8a8455b6ea6efc4d2 [diff]
parent: d43317dcd074818d4bd12ddd4184a29aff98907b [diff]

Merge branch 'integration' into for-linux-next

Conflicts:
	fs/btrfs/inode.c

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

tree: 460944dab0d8feed1c2338ff1bda4bc60d7660e9