From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 30 May 2010 16:16:14 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi... 
X-Git-Tag: v2.6.35-rc1~5
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=003386fff3e02e51cea882e60f7d28290113964c

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:
  mm: export generic_pipe_buf_*() to modules
  fuse: support splice() reading from fuse device
  fuse: allow splice to move pages
  mm: export remove_from_page_cache() to modules
  mm: export lru_cache_add_*() to modules
  fuse: support splice() writing to fuse device
  fuse: get page reference for readpages
  fuse: use get_user_pages_fast()
  fuse: remove unneeded variable
---

003386fff3e02e51cea882e60f7d28290113964c
diff --cc fs/fuse/dev.c
index e53df5ebb2b8,4413f5e7b133..9424796d6634
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@@ -16,9 -16,11 +16,12 @@@
  #include <linux/pagemap.h>
  #include <linux/file.h>
  #include <linux/slab.h>
+ #include <linux/pipe_fs_i.h>
+ #include <linux/swap.h>
+ #include <linux/splice.h>
  
  MODULE_ALIAS_MISCDEV(FUSE_MINOR);
 +MODULE_ALIAS("devname:fuse");
  
  static struct kmem_cache *fuse_req_cachep;