diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-17 21:40:35 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-17 21:40:35 (GMT) |
| commit | 39a50b42f7026027b54131291ad0f350100eac95 (patch) | |
| tree | 609980cbbed5eb6252cbd7e3bec1d42c7051e271 /net/ipv6/xfrm6_output.c | |
| parent | fb09185a88cad9c59e22e84f8c0594303595e9af (diff) | |
| parent | 7dea9665fee828fb56db3bae5b9685d9fa006d33 (diff) | |
| download | linux-fsl-qoriq-39a50b42f7026027b54131291ad0f350100eac95.tar.xz | |
Merge branch 'hfsplus'
Merge hfsplus fixes from Christoph Hellwig:
"Two small hfsplus fixes:
- a one liner regression fix for large volume handling from Janne
Kalliomäki.
- a fixup for the boot image blessing feature to make it work with
the fake "hardlinks" in hfsplus from Matthew Garrett."
* branch 'hfsplus':
hfsplus: fix bless ioctl when used with hardlinks
hfsplus: fix overflow in sector calculations in hfsplus_submit_bio
Diffstat (limited to 'net/ipv6/xfrm6_output.c')
0 files changed, 0 insertions, 0 deletions