| commit | a9d26efc8c89e4ddedc381a88f80c0748331d496 | |
| author | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | |
| Thu, 16 Jul 2009 20:14:44 +0000 (16 22:14 +0200) | ||
| committer | Vladimir 'phcoder' Serbinenko <phcoder@gmail.com> | |
| Thu, 16 Jul 2009 20:14:44 +0000 (16 22:14 +0200) | ||
| tree | 95ee88b70c13ca96ca90ee259f6237b885db289a | treesnapshot (tar.gz zip) |
| parent | d2c4881131e77c809011138b4ee64212bcf43993 | commitdiff |
| parent | d52bd5fc4275185f17b980073b56573328b0ee85 | commitdiff |
Merge branch 'mainline' into nestpart
Conflicts:
ChangeLog
Conflicts:
ChangeLog
| ChangeLog | diff1 | diff2 | blobhistory |
| kern/disk.c | diff1 | diff2 | blobhistory |
| loader/i386/bsd.c | diff1 | diff2 | blobhistory |