diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-20 00:10:53 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-20 00:10:53 +0400 |
| commit | 46be7b73e82453447cd97b3440d523159eab09f8 (patch) | |
| tree | b54c7a44f475e2bfed4b80331cbb836b77e096eb /include | |
| parent | 81770f41447bb2534d29b58a14ab501c0fb1e671 (diff) | |
| parent | 0f23ae74f589304bf33233f85737f4fd368549eb (diff) | |
| download | linux-46be7b73e82453447cd97b3440d523159eab09f8.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"I've got a revert to fix a regression with btrfs device registration,
and Filipe has part two of his fsync fix from last week"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Revert "Btrfs: device_list_add() should not update list when mounted"
Btrfs: set inode's logged_trans/last_log_commit after ranged fsync
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions