tree 094987b35e1d6f5ec552bca336de43dd7848c94a
parent 0637810f24bad641d3d3f80fd3f63f3baffd9536
parent 2456242530a21cfee82646ebeeda65d3f74faa4c
author Linus Torvalds <torvalds@linux-foundation.org> 1234909154 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1234909154 -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: hold trans_mutex when using btrfs_record_root_in_trans
  Btrfs: make a lockdep class for the extent buffer locks
  Btrfs: fs/btrfs/volumes.c: remove useless kzalloc
  Btrfs: remove unused code in split_state()
  Btrfs: remove btrfs_init_path
  Btrfs: balance_level checks !child after access
  Btrfs: Avoid using __GFP_HIGHMEM with slab allocator
  Btrfs: don't clean old snapshots on sync(1)
  Btrfs: use larger metadata clusters in ssd mode
  Btrfs: process mount options on mount -o remount,
  Btrfs: make sure all pending extent operations are complete