Merge branch 'hpfs' (patches from Mikulas)
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Sep 2015 18:55:55 +0000 (11:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 3 Sep 2015 18:55:55 +0000 (11:55 -0700)
Merge hpfs upddate from Mikulas Patocka.

* emailed patches from Mikulas Patocka <mikulas@twibright.com>:
  hpfs: update ctime and mtime on directory modification
  hpfs: support hotfixes


Trivial merge