projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0dc1488 1baa26b)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 15:43:54 +0000 (07:43 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 15:43:54 +0000 (07:43 -0800)
commit7d44b0440147d83a65270205b22e7d365de28948
tree0adc818f569f45912a19482773dabbf71b191b9dtree | snapshot
parent0dc1488527a3c01383a50e5df7187219567586a3commit | diff
parent1baa26b2be92fe9917e2f7ef46d423b5dfa4da71commit | diff
Merge branch 'for-linus' of git://git./linux/kernel/git/mszeredi/fuse

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
  fuse: fix ioctl ABI
  fuse: allow batching of FORGET requests
  fuse: separate queue for FORGET requests
  fuse: ioctl cleanup

Fix up trivial conflict in fs/fuse/inode.c due to RCU lookup having done
the RCU-freeing of the inode in fuse_destroy_inode().
fs/fuse/dir.c diff1 | diff2 | blob | history
fs/fuse/inode.c diff1 | diff2 | blob | history
John Crispins staging tree