From: Linus Torvalds Date: Mon, 8 Mar 2010 22:07:53 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=51d0f6d1f50349579f007adf5c0b51aaedd93b94;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git 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 --- 51d0f6d1f50349579f007adf5c0b51aaedd93b94