projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 90d51d5 0bfaa9c)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2014 03:21:05 +0000 (20:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 21 Jul 2014 03:21:05 +0000 (20:21 -0700)
commitda83fc6e0f379bf80d68d34cca38788a046a71f4
tree8ea6f2b69f8d899c2bb49f0445a93c4f232252eatree | snapshot
parent90d51d56069f8c63b043bacf55c62a98df88ef67commit | diff
parent0bfaa9c5cb479cebc24979b384374fe47500b4c9commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs fixes from Chris Mason:
 "We have two more fixes in my for-linus branch.

  I was hoping to also include a fix for a btrfs deadlock with
  compression enabled, but we're still nailing that one down"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  btrfs: test for valid bdev before kobj removal in btrfs_rm_device
  Btrfs: fix abnormal long waiting in fsync
Unnamed repository; edit this file 'description' to name the repository.