From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Feb 2013 17:02:13 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2608e3d0fa63b892f37a9f1921c2d2b37c7933c1;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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()
---

2608e3d0fa63b892f37a9f1921c2d2b37c7933c1