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)
commit875d11eec5df38bae0003df4a884ef962cf28590
tree83667b7ab2470a3aba40fb9ee868784d77d7e900
parentf3217f9be3225c4943677d03b274cbc0cb4ed228
parent23528282b771d1af3df0fa17f1e909ad3b663f59
Merge commit 'origin/master' into nptl

Conflicts:
libc/signal/sigpause.c
libc/string/x86_64/memset.S

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