diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-09 11:12:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-09 11:12:26 -0800 |
| commit | 9c1db7798141e2658e4b5bb170128dfdc3270ff4 (patch) | |
| tree | 1b582ab69b70f0a91f6ec2a5b4d3c0b963822cc1 /include/linux/page_cgroup.h | |
| parent | 6f2a1c1e78771a78c1696f5a67e8320e76a8dc0b (diff) | |
| parent | a2aa75e18a21b21952dc6daa9bac7c9f4426f81f (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fixes from Chris Mason:
"This is a small collection of fixes"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix data corruption when reading/updating compressed extents
Btrfs: don't loop forever if we can't run because of the tree mod log
btrfs: reserve no transaction units in btrfs_ioctl_set_features
btrfs: commit transaction after setting label and features
Btrfs: fix assert screwup for the pending move stuff
Diffstat (limited to 'include/linux/page_cgroup.h')
0 files changed, 0 insertions, 0 deletions