Merge branch 'master' into memdisk-cd
authorH. Peter Anvin <hpa@zytor.com>
Tue, 17 Mar 2009 04:42:01 +0000 (21:42 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 17 Mar 2009 04:42:01 +0000 (21:42 -0700)
commitbf6a1aa978ff7a1e85077f85c52ef7324136e01c
tree5b5b472c5a40455218d18adb1270e7114a7e6159
parent7e8ae6da382eb345cb07a836d4230fe9064726c5
parent332a924759efe50e783ad3116ecf17d518dfebe2
Merge branch 'master' into memdisk-cd
memdisk/Makefile
memdisk/setup.c