OSDN Git Service
(root)
/
uclinux-h8
/
uClibc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f3217f9
2352828
)
Merge commit 'origin/master' into nptl
author
Austin Foxley
<austinf@cetoncorp.com>
Sat, 19 Dec 2009 22:02:14 +0000
(14:02 -0800)
committer
Austin 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