Nick Kralevich 62bb090f8e resolved conflicts for merge of 5b661481 to master ...

Change-Id: Ifc68a87a95187b61f7f42a0217af43e14db6d4f8

2013-03-29 17:36:52 -07:00

..

arch-arm

Merge "libc/arm: add cortex-a7 cpu variant" into jb-mr2-dev

2013-03-25 19:42:28 +00:00

arch-mips

Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>.

2013-03-21 22:52:25 -07:00

arch-x86

Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.

2013-03-21 22:48:18 -07:00

bionic

Extra logging in pthread_create.

2013-03-29 16:35:00 -07:00

include

am 3c1504d9: am 48f25cef: Merge "Stop generating <sys/linux-syscalls.h>."

2013-03-25 10:24:42 -07:00

kernel

Update processed linux/fs.h header file

2013-03-27 16:05:22 -07:00

netbsd

am cf23cbb1: am 12ea8005: am 5f829205: am c1416647: Merge "Clean up internal libc logging."

2013-03-15 23:43:01 +00:00

private

resolved conflicts for merge of 5b661481 to master

2013-03-29 17:36:52 -07:00

stdio

Define DEFFILEMODE and friends

2012-11-29 11:53:33 -08:00

stdlib

stdlib: atexit: include <sys/cdefs.h>

2013-02-16 21:23:27 +05:30

string

Drop magic number in strrchr and strchr

2013-03-22 10:18:09 +08:00

tools

Remove some dead script code and fix a script comment.

2013-03-25 14:09:52 -07:00

tzcode

Don't search off the end of the index for bad Olson ids.

2013-03-14 14:38:08 -07:00

unistd

Upgrade to current NetBSD popen/pclose.

2013-03-06 16:20:55 -08:00

upstream-dlmalloc

Fix build warning of initialization but no use.

2012-09-06 09:59:13 -07:00

upstream-freebsd

Regenerate NOTICE files.

2013-03-07 11:51:10 -08:00

upstream-netbsd

Upgrade to current NetBSD popen/pclose.

2013-03-06 16:20:55 -08:00

wchar

Switch to upstream-freebsd for the unmolested wchar code.

2013-03-01 18:35:56 -08:00

zoneinfo

Fix a bug in ZoneCompactor that meant the zonetab offset was wrong.

2013-03-14 17:10:24 -07:00

Android.mk

am 85598626: am 34895c1b: Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."

2013-03-22 11:11:34 -07:00

CAVEATS

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

MODULE_LICENSE_BSD

auto import from //depot/cupcake/@135843

2009-03-03 19:28:35 -08:00

NOTICE

Regenerate NOTICE files.

2013-03-07 11:51:10 -08:00

SYSCALLS.TXT

Use the correct names for the __ARM_NR_* syscalls.

2013-03-22 13:53:43 -07:00