tree aca8b61fd63390edf5ddfe17b8ae35dfd56ed74d
parent 33673dcb372b5d8179c22127ca71deb5f3dc7016
parent b6f4bee02f682d1c86ece297871b78ae01afaaf4
author Linus Torvalds <torvalds@linux-foundation.org> 1361466133 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1361466133 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs

Pull v9fs updates from Eric Van Hensbergen:
 "Just fixes and simplifications"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  fs/9p: Fix atomic_open
  fs/9p: Don't use O_TRUNC flag in TOPEN and TLOPEN request
  locking in fs/9p ->readdir()