Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Dec 2011 21:18:59 +0000 (13:18 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 8 Dec 2011 21:18:59 +0000 (13:18 -0800)
commitfb38f9b8fe98a9c1f6b1e57d1b08b1102b293929
tree81282b9875595ece0c3d61a4ea1741aecba0191a
parent8bd1c8815fc23fa4db2376bf667ef885827b48c9
parent1cf4ffdb3289624a6462c94f2ce05545b32ef736
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: drop spin lock when memory alloc fails
  Btrfs: check if the to-be-added device is writable
  Btrfs: try cluster but don't advance in search list
  Btrfs: try to allocate from cluster even at LOOP_NO_EMPTY_SIZE
fs/btrfs/extent-tree.c