OSDN Git Service

resolved conflicts for merge of e5408907 to jb-dev-plus-aosp
authorElliott Hughes <enh@google.com>
Wed, 9 May 2012 20:53:37 +0000 (13:53 -0700)
committerElliott Hughes <enh@google.com>
Wed, 9 May 2012 20:53:37 +0000 (13:53 -0700)
commitdbd5ecad26e39281bb83f97664bc32555c5c071a
tree1d652ad548a322f09cb77e8f5fce98eb7892fbd0
parent58a00b4977b6fa073a8f56d94d741b1e4cb49856
parente54089079b123b207e171c14b2b0dca23c9386f3
resolved conflicts for merge of e5408907 to jb-dev-plus-aosp

Change-Id: If4c3f51bf87b28da8074be2e46ae772a374b266f
libc/SYSCALLS.TXT
libc/arch-mips/syscalls.mk
libc/arch-mips/syscalls/faccessat.S
libc/arch-mips/syscalls/perf_event_open.S
libc/arch-mips/syscalls/tgkill.S
libc/include/sys/linux-syscalls.h
libc/tools/gensyscalls.py