diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-09 05:56:31 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-09 05:56:31 +0300 |
| commit | af0b3152bbfebd3f8291fd61988c12ece4f60f57 (patch) | |
| tree | 1c3b80fc15b7d4880d8bb67f39ddd4e78db504fd /arch/mips/kernel/mips-mt-fpaff.c | |
| parent | Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux (diff) | |
| parent | btrfs: qgroup: Fix a regression in qgroup reserved space. (diff) | |
| download | linux-dev-af0b3152bbfebd3f8291fd61988c12ece4f60f57.tar.xz linux-dev-af0b3152bbfebd3f8291fd61988c12ece4f60f57.zip | |
Merge branch 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs
Pull btrfs fix from Chris Mason:
"We have a btrfs quota regression fix.
I merged this one on Thursday and have run it through tests against
current master.
Normally I wouldn't have sent this while you were finalizing rc6, but
I'm feeding mosquitoes in the adirondacks next week, so I wanted to
get this one out before leaving. I'll leave longer tests running and
check on things during the week, but I don't expect any problems"
* 'for-linus-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
btrfs: qgroup: Fix a regression in qgroup reserved space.
Diffstat (limited to 'arch/mips/kernel/mips-mt-fpaff.c')
0 files changed, 0 insertions, 0 deletions