[commits] r8658 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/sys/epoll.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Jul 11 00:13:35 2009
New Revision: 8658

Log:
Import glibc-mainline for 2009-07-11

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/epoll.h

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Jul 11 00:13:35 2009
@@ -1,3 +1,7 @@
+2009-07-10  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/sys/epoll.h: Fix comment.
+
 2009-07-09  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* configure.in: Check for gnu_unique_symbol symbol type.

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/epoll.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/epoll.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/sys/epoll.h Sat Jul 11 00:13:35 2009
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002-2006, 2007, 2008 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2006, 2007, 2008, 2009 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -31,7 +31,7 @@
 #endif
 
 
-/* Flags to be passed to epoll_create2.  */
+/* Flags to be passed to epoll_create1.  */
 enum
   {
     EPOLL_CLOEXEC = 02000000,