projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb09185 7dea966)
Merge branch 'hfsplus'
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jun 2012 21:40:35 +0000 (14:40 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 17 Jun 2012 21:40:35 +0000 (14:40 -0700)
commit39a50b42f7026027b54131291ad0f350100eac95
tree609980cbbed5eb6252cbd7e3bec1d42c7051e271tree | snapshot
parentfb09185a88cad9c59e22e84f8c0594303595e9afcommit | diff
parent7dea9665fee828fb56db3bae5b9685d9fa006d33commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.