commit 522dba7134d6b2e5821d3457f7941ec34f668e6d
Merge: 51d0f6d bb910a7
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Mar 8 16:10:29 2010 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      PCI/PM Runtime: Make runtime PM of PCI devices inactive by default

commit 51d0f6d1f50349579f007adf5c0b51aaedd93b94
Merge: 57d5488 da495ec
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Mar 8 14:07:53 2010 -0800

    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

commit da495ecc0fb096b383754952a1c152147bc95b52
Author: Josef Bacik <josef@redhat.com>
Date:   Thu Feb 25 20:38:35 2010 +0000

    Btrfs: kfree correct pointer during mount option parsing
    
    We kstrdup the options string, but then strsep screws with the pointer,
    so when we kfree() it, we're not giving it the right pointer.
    
    Tested-by: Andy Lutomirski <luto@mit.edu>
    
    Signed-off-by: Chris Mason <chris.mason@oracle.com>

commit 6bef4d317193d3badbbfa3f3c593758ace84a629
Author: Eric Paris <eparis@redhat.com>
Date:   Tue Feb 23 19:43:04 2010 +0000

    Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL
    
    btrfs inialize rb trees in quite a number of places by settin rb_node =
    NULL;  The problem with this is that 17d9ddc72fb8bba0d4f678 in the
    linux-next tree adds a new field to that struct which needs to be NULL for
    the new rbtree library code to work properly.  This patch uses RB_ROOT as
    the intializer so all of the relevant fields will be NULL'd.  Without the
    patch I get a panic.
    
    Signed-off-by: Eric Paris <eparis@redhat.com>
    Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
    Signed-off-by: Chris Mason <chris.mason@oracle.com>

commit bb910a7040e90a0ca3d3e8245d6d5c128a5d1287
Author: Rafael J. Wysocki <rjw@sisk.pl>
Date:   Sat Feb 27 21:37:37 2010 +0100

    PCI/PM Runtime: Make runtime PM of PCI devices inactive by default
    
    Make the run-time power management of PCI devices be inactive by
    default by calling pm_runtime_forbid() for each PCI device during its
    initialization.  This setting may be overriden by the user space with
    the help of the /sys/devices/.../power/control interface.
    
    That's necessary to avoid breakage on systems where ACPI-based
    wake-up is known to fail for some devices.
    
    Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>