Merge penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/epoll-0.15

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux

diff --cc drivers/char/Makefile
Simple merge

diff --cc fs/Makefile
Simple merge

diff --cc fs/pipe.c
index c1eabd1b2d9a448f411b9937f3dab63ef2726a4b,572ef04527d3a0c00703e5617b4325de7654ab10..8fcd6c03cbb6e840ea5697606f24fb465ea467c9
--- 1/fs/pipe.c
--- 2/fs/pipe.c
+++ b/fs/pipe.c
@@@ -108,8 -110,11 +110,11 @@@ pipe_read(struct file *filp, char *buf
                        if (!ret) ret = -ERESTARTSYS;
                        break;
                }
+               /* Send notification message */
+               if (pfull && !PIPE_FULL(*inode) && PIPE_WRITEFILE(*inode))
+                       file_send_notify(PIPE_WRITEFILE(*inode), ION_OUT, POLLOUT | POLLWRNORM | POLLWRBAND);
                if (do_wakeup) {
 -                      wake_up_interruptible(PIPE_WAIT(*inode));
 +                      wake_up_interruptible_sync(PIPE_WAIT(*inode));
                        kill_fasync(PIPE_FASYNC_WRITERS(*inode), SIGIO, POLL_OUT);
                }
                pipe_wait(inode);

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