projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit5dbc746960b5cd62c558cd6663697afd41f59d39
tree41486216b93c026c92743d64e16295528ac68c88tree | snapshot
parentf97f7d2d27bf092b40babda9ded29cc85cf77eeccommit | diff
parent14c14414d157ea851119c96c61a17306a2b4a035commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

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()
John Crispins staging tree