Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
commit2608e3d0fa63b892f37a9f1921c2d2b37c7933c1
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Feb 2013 17:02:13 +0000 (21 09:02 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Feb 2013 17:02:13 +0000 (21 09:02 -0800)
treeaca8b61fd63390edf5ddfe17b8ae35dfd56ed74d
parent33673dcb372b5d8179c22127ca71deb5f3dc7016
parentb6f4bee02f682d1c86ece297871b78ae01afaaf4
Merge branch 'for-linus' of git://git./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()