merge mainline into net

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-07-08 13:34:37 +02:00
commit 6e706342c3
8 changed files with 409 additions and 290 deletions

View file

@ -195,8 +195,6 @@ kernel = {
emu = gnulib/error.c;
emu = kern/emu/cache_s.S;
emu = kern/emu/console.c;
emu = kern/emu/getroot.c;
emu = kern/emu/raid.c;
emu = kern/emu/hostdisk.c;
emu = kern/emu/hostfs.c;
emu = kern/emu/main.c;