Merge epoll update

diff --cc fs/Makefile
index 42700ab2e563637d8fc16ef40e44dcf6ec023fcd,fb8a5bfecfab717287ac10658abbe31a403045e6..cb865dc62657985667e79f066faab875992e4002
--- 1/fs/Makefile
--- 2/fs/Makefile
+++ b/fs/Makefile
@@@ -6,8 -6,7 +6,7 @@@
  # 
  
  export-objs :=        open.o dcache.o buffer.o bio.o inode.o dquot.o mpage.o aio.o \
-                 fcntl.o read_write.o dcookies.o fcblist.o mbcache.o \
-               posix_acl.o xattr_acl.o
 -                fcntl.o read_write.o dcookies.o
++                fcntl.o read_write.o dcookies.o mbcache.o posix_acl.o xattr_acl.o
  
  obj-y :=      open.o read_write.o devices.o file_table.o buffer.o \
                bio.o super.o block_dev.o char_dev.o stat.o exec.o pipe.o \

diff --cc fs/pipe.c
Simple merge

diff --cc include/linux/fs.h
Simple merge