OSDN Git Service

Merge commit 'origin/master' into nptl
authorAustin Foxley <austinf@cetoncorp.com>
Tue, 6 Apr 2010 15:58:29 +0000 (08:58 -0700)
committerAustin Foxley <austinf@cetoncorp.com>
Tue, 6 Apr 2010 15:58:33 +0000 (08:58 -0700)
commitf10d127d36ada5b202cdea521e61b05522beb192
tree44ae75bf0745de49fb46616afd4cf577cf7a258a
parentc3af26045aa44286482fbfe93097f24b48cfb6a3
parent384a55ef9f3387ed33eadab3eefe5057b4daeadb
Merge commit 'origin/master' into nptl

Conflicts:
libc/misc/utmp/utent.c
libc/sysdeps/linux/i386/bits/syscalls.h

Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
libc/misc/utmp/utent.c
test/Rules.mak