projects / linux-drm-fsl-dcu.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 797afdf 1bda19e)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Oct 2013 23:46:21 +0000 (16:46 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Oct 2013 23:46:21 +0000 (16:46 -0700)
commitbdeeab62a611f1f7cd48fd285ce568e8dcd0455a
tree93e5e16b5ef769093dca6cb23e44b83433f4b688tree | snapshot
parent797afdf70844c719d229174c460687fb17af9762commit | diff
parent1bda19eb73d68b304148e67253e47cef049a419dcommit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fix from Chris Mason:
 "Sage hit a deadlock with ceph on btrfs, and Josef tracked it down to a
  regression in our initial rc1 pull.  When doing nocow writes we were
  sometimes starting a transaction with locks held"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: release path before starting transaction in can_nocow_extent
fs/btrfs/inode.c diff1 | diff2 | blob | history
Freescale DCU DRM driver