diff options
| author | Chris Mason <chris.mason@oracle.com> | 2009-09-24 16:00:58 +0200 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2009-09-24 16:00:58 +0200 |
| commit | 54bcf382daf08c1396edb8b81e650b58930ccaef (patch) | |
| tree | 64b941f09489b5c9ee63e4ad43d736bfce911b21 /fs/open.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus (diff) | |
| parent | Btrfs: hash the btree inode during fill_super (diff) | |
| download | linux-54bcf382daf08c1396edb8b81e650b58930ccaef.tar.xz linux-54bcf382daf08c1396edb8b81e650b58930ccaef.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable into for-linus
Conflicts:
fs/btrfs/super.c
Diffstat (limited to 'fs/open.c')
0 files changed, 0 insertions, 0 deletions