OSDN Git Service

(root) / uclinux-h8 / uClibc.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ef18cfe 2864786)
Merge commit 'origin/master' into nptl
authorAustin Foxley <austinf@cetoncorp.com>
Fri, 2 Apr 2010 16:17:30 +0000 (09:17 -0700)
committerAustin Foxley <austinf@cetoncorp.com>
Fri, 2 Apr 2010 16:17:30 +0000 (09:17 -0700)
commitaae3eb9256affb18cff589b52ee26e0a4e557bbd
tree003711a54e7dfbde0b50979e2942fd3e0d3451c8tree | snapshot
parentef18cfe8ebab25f5ef92e81956f50e2dc57df602commit | diff
parent2864786ad884369ab5397be864e9f43d32bc2726commit | diff
Merge commit 'origin/master' into nptl

Conflicts:
Makefile.in
extra/Configs/Config.in
libc/sysdeps/linux/common/bits/kernel-features.h
libc/sysdeps/linux/common/poll.c
libc/sysdeps/linux/common/sysdep.h
libc/sysdeps/linux/sh/sysdep.h

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
12 files changed:
Makefile.in diff1 | diff2 | blob | history
Rules.mak diff1 | diff2 | blob | history
libc/Makefile.in diff1 | diff2 | blob | history
libc/misc/pthread/Makefile.in diff1 | diff2 | blob | history
libc/signal/Makefile.in diff1 | diff2 | blob | history
libc/stdlib/Makefile.in diff1 | diff2 | blob | history
libc/string/Makefile.in diff1 | diff2 | blob | history
libc/sysdeps/linux/common/Makefile.in diff1 | diff2 | blob | history
libc/sysdeps/linux/common/poll.c diff1 | diff2 | blob | history
libc/sysdeps/linux/common/sysdep.h diff1 | diff2 | blob | history
librt/Makefile.in diff1 | diff2 | blob | history
test/Rules.mak diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help