Merge remote-tracking branch 'genec/gpxelinux-kpxe-for-hpa'
authorH. Peter Anvin <hpa@zytor.com>
Thu, 17 Mar 2011 18:58:35 +0000 (11:58 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 17 Mar 2011 18:58:35 +0000 (11:58 -0700)
1  2 
Makefile

diff --cc Makefile
Simple merge