diff options
| author | Erwan Velu <erwan.velu@free.fr> | 2009-04-23 21:10:32 +0200 |
|---|---|---|
| committer | Erwan Velu <erwan.velu@free.fr> | 2009-04-23 21:10:32 +0200 |
| commit | 75c9aef767d9ab556c92e6e50a0ca0b61b898916 (patch) | |
| tree | f6148cadbdaa0f47e02d3e1b9c59c6ae1221e8cb /com32/gplinclude | |
| parent | 98bd2d140d31e5ce4b83589a546a70183a22b4e1 (diff) | |
| parent | 6af3d0ea72a6f6852bda7519278a0c6fdd16d2b5 (diff) | |
| download | syslinux-75c9aef767d9ab556c92e6e50a0ca0b61b898916.tar.gz syslinux-75c9aef767d9ab556c92e6e50a0ca0b61b898916.tar.xz syslinux-75c9aef767d9ab556c92e6e50a0ca0b61b898916.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/boot/syslinux/syslinux into mainline
Conflicts:
com32/hdt/hdt-cli-pci.c
com32/hdt/hdt-cli-vesa.c
com32/hdt/hdt-common.c
com32/hdt/hdt-menu-dmi.c
Diffstat (limited to 'com32/gplinclude')
| -rw-r--r-- | com32/gplinclude/cpuid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/gplinclude/cpuid.h b/com32/gplinclude/cpuid.h index 2473b41e..ca1c3142 100644 --- a/com32/gplinclude/cpuid.h +++ b/com32/gplinclude/cpuid.h @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- * - * + * * Copyright 2006-2009 Erwan Velu - All Rights Reserved * * Portions of this file taken from the Linux kernel, |