Merge branch 'efiemu' into phcoder
commit0173d9f748ca664f6f861a4d105f8eb1931d62ce
authorVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 17 Jul 2009 10:49:16 +0000 (17 12:49 +0200)
committerVladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Fri, 17 Jul 2009 10:49:16 +0000 (17 12:49 +0200)
tree977ef9ee6610131616635da2f99a4a5cc280fb52
parente78c35ea56904c8614bc261672356339e4dc6005
parent6b9468d04d2362dae6210f219a150e2093a7d20a
Merge branch 'efiemu' into phcoder

Conflicts:
ChangeLog
partmap/sun.c
ChangeLog
Makefile.in
conf/i386-pc.rmk
configure.ac
kern/disk.c
loader/i386/multiboot.c
normal/main.c
partmap/sun.c