diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-19 13:10:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-19 13:10:53 -0700 |
| commit | 46be7b73e82453447cd97b3440d523159eab09f8 (patch) | |
| tree | b54c7a44f475e2bfed4b80331cbb836b77e096eb /drivers/gpu/vga/vga_switcheroo.c | |
| parent | Merge tag 'nfs-for-3.17-5' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | Revert "Btrfs: device_list_add() should not update list when mounted" (diff) | |
| download | linux-dev-46be7b73e82453447cd97b3440d523159eab09f8.tar.xz linux-dev-46be7b73e82453447cd97b3440d523159eab09f8.zip | |
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 'drivers/gpu/vga/vga_switcheroo.c')
0 files changed, 0 insertions, 0 deletions