From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 27 Oct 2016 19:52:46 +0000 (-0700)
Subject: Merge tag 'for-linus-4.9-rc2-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: microblaze-4.10-rc1~97
X-Git-Url: http://git.monstr.eu/?a=commitdiff_plain;h=e3300ffef0653774f1099cab153d25d24bd773ce;p=linux-2.6-microblaze.git

Merge tag 'for-linus-4.9-rc2-ofs-1' of git://git./linux/kernel/git/hubcap/linux

Pull oreangefs updates from Mike Marshall:
 "A couple of orangefs cleanups sent in by other developers:

   - use d_fsdata instead of d_time (Miklos Szeredi)

   - use file_inode(file) instead of file->f_path.dentry->d_inode (Amir
     Goldstein)"

* tag 'for-linus-4.9-rc2-ofs-1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux:
  orangefs: don't use d_time
  orangefs: user file_inode() where it is due
---

e3300ffef0653774f1099cab153d25d24bd773ce