| commit | 51d0f6d1f50349579f007adf5c0b51aaedd93b94 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 08 14:07:53 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Mar 08 14:07:53 2010 -0800 |
| tree | 6ea3f2683c3017d63101e708309665727eb2a7cc | |
| parent | 57d54889cd00db2752994b389ba714138652e60c [diff] | |
| parent | da495ecc0fb096b383754952a1c152147bc95b52 [diff] |
Merge git://git.kernel.org/pub/scm/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