tree 637c734a7466e43d3786968891e746c5b70d6a4b
parent d14f5b810b49c7dbd1a01be1c6d3641d46090080
parent c9ddec74aa950a220cc4caa5215cfc5d886050b7
author Linus Torvalds <torvalds@linux-foundation.org> 1302031765 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1302031765 -0700

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: don't warn in btrfs_add_orphan
  Btrfs: fix free space cache when there are pinned extents and clusters V2
  Btrfs: Fix uninitialized root flags for subvolumes
  btrfs: clear __GFP_FS flag in the space cache inode
  Btrfs: fix memory leak in start_transaction()
  Btrfs: fix memory leak in btrfs_ioctl_start_sync()
  Btrfs: fix subvol_sem leak in btrfs_rename()
  Btrfs: Fix oops for defrag with compression turned on
  Btrfs: fix /proc/mounts info.
  Btrfs: fix compiler warning in file.c