Merge git://git.etherboot.org/scm/gpxe into expt
authorLynus Vaz <lynus@Arch.localdomain>
Thu, 25 Jun 2009 03:27:45 +0000 (08:57 +0530)
committerLynus Vaz <lynus@Arch.localdomain>
Thu, 25 Jun 2009 03:27:45 +0000 (08:57 +0530)
commit0aa976ccb735b0fd8445f6c46172e1eee2a2f59f
tree6d0fab43ec76d392ba7340375a43d92f6c08b138
parent46d979297a96bc2723fd273476570d47bf4da292
parent15ce2fb851067eb64543859737e2d42f8a271ed6
Merge git://git.etherboot.org/scm/gpxe into expt

Conflicts:
src/core/exec.c
[misc] Sync with gpxe.git
src/core/exec.c
src/hci/arith.c
src/hci/commands/if_cmd.c
src/include/gpxe/gen_stack.h