projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4efdedc b6dd6f4)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 May 2014 18:15:57 +0000 (11:15 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 28 May 2014 18:15:57 +0000 (11:15 -0700)
commit282695802957b069d293a9f8773a14399093bd6f
treec362f39413243fb3f153104afa81028dad497b07tree | snapshot
parent4efdedca932658cc54866ee19001af3cbffa3769commit | diff
parentb6dd6f4738837439c520e73995ec93fe1de2ec72commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs

Pull vfs fix from Al Viro:
 "Oh, well...  Still nothing useful on that livelock (I had something
  that looked kinda-sorta like a non-invasive solution, but it
  deadlocks), so it's just Miklos' vmsplice fix for now"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  vfs: fix vmplice_to_user()
Unnamed repository; edit this file 'description' to name the repository.