OSDN Git Service

Merge commit 'origin/master' into nptl
authorAustin Foxley <austinf@cetoncorp.com>
Sat, 19 Dec 2009 22:02:14 +0000 (14:02 -0800)
committerAustin Foxley <austinf@cetoncorp.com>
Sat, 19 Dec 2009 22:03:00 +0000 (14:03 -0800)
Conflicts:
libc/signal/sigpause.c
libc/string/x86_64/memset.S

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>

Trivial merge