]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
Merge branch 'master' of ssh://sourceware.org/git/glibc
authorUlrich Drepper <drepper@gmail.com>
Tue, 15 Nov 2011 18:29:11 +0000 (13:29 -0500)
committerUlrich Drepper <drepper@gmail.com>
Tue, 15 Nov 2011 18:29:11 +0000 (13:29 -0500)
Conflicts:
sysdeps/unix/sysv/linux/clock_gettime.c


Trivial merge