resolved conflicts for merge of 43a3d66f to master

Change-Id: I5e09ee0778f6971ae2c34de23f719328035c61ed

libc/docs/CHANGES.TXT

@@ -13,6 +13,9 @@ Differences between current and Android 2.2:
 - <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:
 

libc/unistd/sysconf.c

@@ -317,7 +317,7 @@ line_parser_addc( LineParser*  p, int  c )
 static int
 line_parser_getc( LineParser*  p )
 {
-    if (p->in_len >= p->in_pos) {
+    if (p->in_pos >= p->in_len) {
         int  ret;
 
         p->in_len = p->in_pos = 0;