Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	fs/cifs/export.c

1 files changed, 1 insertions, 1 deletions

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 3c6c1fd2be90..1a81cd66d63b 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -120,7 +120,6 @@ const struct file_operations ext4_file_operations = {
         .open           = generic_file_open,
         .release        = ext4_release_file,
         .fsync          = ext4_sync_file,
-        .sendfile       = generic_file_sendfile,
         .splice_read    = generic_file_splice_read,
         .splice_write   = generic_file_splice_write,
 };
@@ -135,5 +134,6 @@ const struct inode_operations ext4_file_inode_operations = {
         .removexattr    = generic_removexattr,
 #endif
         .permission     = ext4_permission,
+        .fallocate      = ext4_fallocate,
 };