Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 16:32:05 +0000 (09:32 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 28 Oct 2010 16:32:05 +0000 (09:32 -0700)
commit11cc21f5f5575b9abd14d53a6055ccbf72b67573
treed9a93174b25021748f11e4e797267f381bf4485b
parent19ef20143ff86c8012270c619ac7b6c3b389a8fa
parent85b8fe8cc47b0dc1068475ba95f29ddff10a8efc
Merge branch 'for-next' of git://git./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
fs/hfsplus/dir.c