From: Linus Torvalds <torvalds@linux-foundation.org>
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-Tag: v2.6.34-rc2~278
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=51d0f6d1f50349579f007adf5c0b51aaedd93b94

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