refs/heads/viro - pub/scm/linux/kernel/git/mason/linux-test

commit: 2662fa8edb1122ae31069fd34d0d1474a6958764
[log] [tgz]
author: Chris Mason <chris.mason@oracle.com>
Mon Jan 16 20:58:22 2012 -0500
committer: Chris Mason <chris.mason@oracle.com>
Mon Jan 16 20:58:22 2012 -0500
tree: c21bcacad76c1e415dd25fdc67e69fc9429d0bb2
parent: 96bdc7dc61fb1b1e8e858dafb13abee8482ba064 [diff]
parent: f84a8bd60e3ee49eacc9ba824babf149ba3dad7e [diff]

Merge branch 'btrfs' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs into integration

Conflicts:
	fs/btrfs/ioctl.c

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

tree: c21bcacad76c1e415dd25fdc67e69fc9429d0bb2