From: Ulrich Drepper <drepper@gmail.com>
Date: Sat, 2 Apr 2011 19:28:16 +0000 (-0400)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.14~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=955ce8cf2d884b3419c058de562174046daad95b;p=thirdparty%2Fglibc.git

Merge branch 'master' of ssh://sourceware.org/git/glibc

Conflicts:
	ChangeLog
---

955ce8cf2d884b3419c058de562174046daad95b
diff --cc ChangeLog
index 8794892142f,ac0c772c50a..058f3de8221
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,7 +1,9 @@@
  2011-04-02  Ulrich Drepper  <drepper@gmail.com>
  
 +	* sysdeps/unix/sysv/linux/bits/time.h (CLOCK_BOOTTIME): Define.
 +
+ 	* include/features.h: Mention __USW_XOPEN2K8 in comment.
+ 
  2011-03-26  H.J. Lu  <hongjiu.lu@intel.com>
  
  	[BZ #12518]