tree 30d223a3a3c7470c657284ef030657bd1753d4d3
parent 2b650df2cea96e487f2fd9ecaa68e533ea9b5ed7
parent 444528b3e614f7f2391488d9bca8e0b872db909b
author Linus Torvalds <torvalds@linux-foundation.org> 1255644397 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1255644397 -0700

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

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: always pin metadata in discard mode
  Btrfs: enable discard support
  Btrfs: add -o discard option
  Btrfs: properly wait log writers during log sync
  Btrfs: fix possible ENOSPC problems with truncate
  Btrfs: fix btrfs acl #ifdef checks
  Btrfs: streamline tree-log btree block writeout
  Btrfs: avoid tree log commit when there are no changes
  Btrfs: only write one super copy during fsync