commit | 11cc21f5f5575b9abd14d53a6055ccbf72b67573 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 28 09:32:05 2010 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Oct 28 09:32:05 2010 -0700 |
tree | d9a93174b25021748f11e4e797267f381bf4485b | |
parent | 19ef20143ff86c8012270c619ac7b6c3b389a8fa [diff] | |
parent | 85b8fe8cc47b0dc1068475ba95f29ddff10a8efc [diff] |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus: hfsplus: free space correcly for files unlinked while open hfsplus: fix double lock typo in ioctl