Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <[e-mail]>

fs/splice.c

···
 #include <linux/pipe_fs_i.h>
 #include <linux/mm_inline.h>
 #include <linux/swap.h>
+#include <linux/module.h>
 
 /*
  * Passed to the actors
···
 {
 	return move_from_pipe(inode, out, len, flags, pipe_to_sendpage);
 }
+
+EXPORT_SYMBOL(generic_file_splice_write);
+EXPORT_SYMBOL(generic_file_splice_read);
 
 static long do_splice_from(struct inode *pipe, struct file *out, size_t len,
 			   unsigned int flags)