Ian Romanick da09964a93 Merge branch 'origin' into pci-rework ... Conflicts: hw/xfree86/int10/generic.c		2007-01-09 15:27:34 -08:00
..
vm86	Fix linux build without libc wrappers (From Fredrik Höglund)	2006-02-13 04:56:27 +00:00
linux.c	Merge branch 'origin' into pci-rework	2007-01-09 15:27:34 -08:00