projects / platform / upstream / syslinux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba4fefa d8ce3aa)
Merge branch 'pxelinux' into for-hpa/elflink/ldlinux
authorMatt Fleming <matt.fleming@linux.intel.com>
Tue, 7 Jun 2011 19:06:01 +0000 (20:06 +0100)
committerMatt Fleming <matt.fleming@linux.intel.com>
Tue, 7 Jun 2011 19:06:01 +0000 (20:06 +0100)
Conflicts:
core/pxelinux.asm

1  2 
core/include/core.h patch | diff1 | diff2 | blob | history

diff --cc core/include/core.h
Simple merge
Domain: System / Base;