projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f97f7d2 14c1441)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jun 2013 19:06:04 +0000 (09:06 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 25 Jun 2013 19:06:04 +0000 (09:06 -1000)
Pull fuse bugfix from Miklos Szeredi:
 "This fixes a race between fallocate() and truncate()"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: hold i_mutex in fuse_file_fallocate()


Trivial merge
John Crispins staging tree