projects / linux-drm-fsl-dcu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8bd1c88 1cf4ffd)
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)
* '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

1  2 
fs/btrfs/extent-tree.c patch | diff1 | diff2 | blob | history

diff --cc fs/btrfs/extent-tree.c
Simple merge
Freescale DCU DRM driver