| commit | 11da37b26301be772c289c5406aec347ad140bd6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 22 05:40:13 2014 +0900 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu May 22 05:40:13 2014 +0900 |
| tree | 383d1f644f8cdfb3653ddbd6ecc033ffb8d1107c | |
| parent | 30625569031641eba1cd1f71148cf188500861a2 [diff] | |
| parent | 51a60253a58514524b7a347c4e68553821a79d04 [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull two btrfs fixes from Chris Mason: "This has two fixes that we've been testing for 3.16, but since both are safe and fix real bugs, it makes sense to send for 3.15 instead" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: send, fix incorrect ref access when using extrefs Btrfs: fix EIO on reading file after ioctl clone works on it