Merge branch 'master' into elflink-merge
authorH. Peter Anvin <hpa@zytor.com>
Fri, 13 Aug 2010 03:48:33 +0000 (20:48 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Fri, 13 Aug 2010 03:52:53 +0000 (20:52 -0700)
commita104d9a4fd0762b4167668bb43eaeef10469ee9c
tree397f11badacb1c864e689a0aaaba17e051cff171
parent0fb20934d2145e43f08650dbbf6613f24f2df8c6
parentf3ab4925bd8c5c42cf17a34377f82b53b48b132e
Merge branch 'master' into elflink-merge

Resolved Conflicts:
core/diskfs.inc
core/mem/free.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
core/diskfs.inc
core/diskstart.inc
core/extern.inc
core/include/core.h
core/include/fs.h
core/mem/free.c