| commit | 51d0f6d1f50349579f007adf5c0b51aaedd93b94 | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 8 Mar 2010 22:07:53 +0000 (8 14:07 -0800) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Mon, 8 Mar 2010 22:07:53 +0000 (8 14:07 -0800) | ||
| tree | 6ea3f2683c3017d63101e708309665727eb2a7cc | treesnapshot (tar.gz zip) |
| parent | 57d54889cd00db2752994b389ba714138652e60c | commitdiff |
| parent | da495ecc0fb096b383754952a1c152147bc95b52 | commitdiff |
Merge git://git./linux/kernel/git/mason/btrfs-unstable
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: kfree correct pointer during mount option parsing
Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
Btrfs: kfree correct pointer during mount option parsing
Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL
| fs/btrfs/extent_map.c | diff1 | diff2 | blobhistory |