resolved conflicts for merge of 43a3d66f to master

Change-Id: I5e09ee0778f6971ae2c34de23f719328035c61ed

diff --cc libc/docs/CHANGES.TXT
index 9407173,8bfa61e..e700da4
--- 1/libc/docs/CHANGES.TXT
--- 2/libc/docs/CHANGES.TXT
+++ b/libc/docs/CHANGES.TXT
@@@ -10,9 -13,9 +10,12 @@@ Differences between current and Androi
  - <sys/sysinfo.h>: Added missing sysinfo() system call implementation
    (the function was already declared in the header though).
  
 +- <semaphore.h>: Use private futexes for semaphore implementation,
 +  unless your set 'pshared' to non-0 when calling sem_init().
 +
+ - sysconf() didn't work for some arguments due to a small bug in the
+   /proc line parser.
+ 
  -------------------------------------------------------------------------------
  Differences between Android 2.2. and Android 2.1: