diff options
| author | Linus Torvalds | 2015-02-26 10:34:24 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2015-02-26 10:34:24 -0800 |
| commit | 7dac5cb1bc8c4bc420f0cafd9c42d693eadfdd7e (patch) | |
| tree | d9577362d46069bf69c956577c0cd2444d0b22b2 /Makefile | |
| parent | b24e2bdde4af656bb0679a101265ebb8f8735d3c (diff) | |
| parent | e57cf21e9787c081db4db6afa02e6e70112ee410 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason:
"I'm still testing more fixes, but I wanted to get out the fix for the
btrfs raid5/6 memory corruption I mentioned in my merge window pull"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
Btrfs: fix allocation size calculations in alloc_btrfs_bio
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions