diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-04-04 15:00:34 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-04-04 15:00:34 -0700 |
| commit | 2cd336282f7b3411cf6f384d82487a11e1ccfc1e (patch) | |
| tree | 9977477d71edcbde1dd382aaa131c03fafee232a /core/comboot.inc | |
| parent | 0622cf1442f4f04c12ad91e0652b97f2a01c1e93 (diff) | |
| parent | 390a4bf409a4574fe3272adf9f873ef78b78c167 (diff) | |
| download | syslinux-2cd336282f7b3411cf6f384d82487a11e1ccfc1e.tar.gz | |
Merge branch 'master' into new-shuffler
Conflicts:
com32/lib/syslinux/memmap.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'core/comboot.inc')
| -rw-r--r-- | core/comboot.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/comboot.inc b/core/comboot.inc index 8226d478..452076c6 100644 --- a/core/comboot.inc +++ b/core/comboot.inc @@ -1,6 +1,7 @@ ;; ----------------------------------------------------------------------- ;; ;; Copyright 1994-2009 H. Peter Anvin - All Rights Reserved +;; Copyright 2009 Intel Corporation; author: H. Peter Anvin ;; ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by |