merge mainline
authorColin Watson <cjwatson@ubuntu.com>
Sat, 12 Jun 2010 11:17:28 +0000 (12:17 +0100)
committerColin Watson <cjwatson@ubuntu.com>
Sat, 12 Jun 2010 11:17:28 +0000 (12:17 +0100)
commit934302d00b8ff550412877e9401d368ee360b17b
treeddb1fdec5b88ee206487792069252f93a090586b
parent8253ee6bd7b1f77a4a71dcf40dcb6f3f31e895bd
parent283af07aff47fdc234e80da3fa4c5891f0ab9289
merge mainline
conf/i386-pc.rmk
conf/x86-efi.rmk
loader/i386/efi/linux.c
loader/i386/xnu.c