OSDN Git Service

Merge commit 'origin/master' into nptl
authorKhem Raj <raj.khem@gmail.com>
Mon, 1 Feb 2010 20:28:54 +0000 (12:28 -0800)
committerKhem Raj <raj.khem@gmail.com>
Mon, 1 Feb 2010 20:28:54 +0000 (12:28 -0800)
commit9e22545a13d62299c59b048ae5923bf6da14ff9f
tree2aab233cda445781073c1f7f9dec154b867aa139
parente999106d1b95e63283e9bb8246e5c34e9c1e85f7
parent22de495da40d7649eb28fdfc70ce1d5f3b6572ea
Merge commit 'origin/master' into nptl

Conflicts:
libc/stdlib/Makefile.in

Signed-off-by: Khem Raj <raj.khem@gmail.com>
libc/signal/Makefile.in
libc/stdlib/Makefile.in