Merge branch 'master', remote-tracking branch 'sami/ng'

2011-10-01 23:23:30 +10:00
parent f7fb8bddf4 367fd902da
commit b9a408372e
43 changed files with 452 additions and 578 deletions
--- a/proc/sysinfo.c
+++ b/proc/sysinfo.c
@ -221,7 +221,7 @@ static void old_Hertz_hack(void){

 #define NOTE_NOT_FOUND 42

-//extern char** environ;
+extern char** environ;

 /* for ELF executables, notes are pushed before environment and args */
 static unsigned long find_elf_note(unsigned long findme){