From: Ulrich Drepper <drepper@gmail.com>
Date: Tue, 15 Nov 2011 18:29:11 +0000 (-0500)
Subject: Merge branch 'master' of ssh://sourceware.org/git/glibc
X-Git-Tag: glibc-2.15~80
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=116415f80eeb88e1973a160b8a2ee707d24481b4;p=platform%2Fupstream%2Fglibc.git

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

Conflicts:
	sysdeps/unix/sysv/linux/clock_gettime.c
---

116415f80eeb88e1973a160b8a2ee707d24481b4