commit 0e78f786777a04af498b43564a8d6ed8e15e8940
author The Android Open Source Project <initial-contribution@android.com> Fri Jul 09 10:48:45 2010 -0700
committer The Android Open Source Project <initial-contribution@android.com> Fri Jul 09 10:48:45 2010 -0700
tree b156d1bf2c5efdcb6af23294baac4161daf5ede4
parent 611793d6abcf504544d6ebccb8c46da06464b701
parent fc6d95b10e7629f61013d221cbc1cdbff0190ac0

merge from open-source master

Change-Id: Id84ff747889d6f2c15c0510263e32fdfdd18dbed

libc/bionic/libc_init_common.c

diff --git a/libc/bionic/libc_init_common.c b/libc/bionic/libc_init_common.c
index d78d673..dd6e027 100644
--- a/libc/bionic/libc_init_common.c
+++ b/libc/bionic/libc_init_common.c
@@ -62,7 +62,7 @@
     static pthread_internal_t  thread;
     static void*               tls_area[BIONIC_TLS_SLOTS];
 
-    /* setup pthread runtime and maint thread descriptor */
+    /* setup pthread runtime and main thread descriptor */
     unsigned stacktop = (__get_sp() & ~(PAGE_SIZE - 1)) + PAGE_SIZE;
     unsigned stacksize = 128 * 1024;
     unsigned stackbottom = stacktop - stacksize;

libc/bionic/libc_init_dynamic.c

diff --git a/libc/bionic/libc_init_dynamic.c b/libc/bionic/libc_init_dynamic.c
index 682ebcf..97e80ea 100644
--- a/libc/bionic/libc_init_dynamic.c
+++ b/libc/bionic/libc_init_dynamic.c
@@ -61,7 +61,7 @@
 
 void __libc_prenit(void)
 {
-    /* Read the ELF data pointer form a special slot of the
+    /* Read the ELF data pointer from a special slot of the
      * TLS area, then call __libc_init_common with it.
      *
      * Note that: