From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 10 Jan 2011 15:43:54 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... 
X-Git-Tag: v2.6.38-rc1~448
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d44b0440147d83a65270205b22e7d365de28948;p=pandora-kernel.git

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

7d44b0440147d83a65270205b22e7d365de28948
Reading git-diff-tree failed