summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2011-05-03 17:34:44 -0300
committerMarcelo Tosatti <mtosatti@redhat.com>2011-05-03 17:34:44 -0300
commit2d7abfd627bba11ec072f23d2c8c8e0c4a3fb647 (patch)
treef98b204367dba6d527ba4d288028bbf00c4a815f /.gitmodules
parent4183a43d1405fbb9da3ccb3dcff223266a36df9f (diff)
parent5ee8ad71e159e724e2fa1af6b2c502668179502a (diff)
Merge commit '5ee8ad71e159e724e2fa1af6b2c502668179502a' into upstream-merge
* commit '5ee8ad71e159e724e2fa1af6b2c502668179502a': PXE: Use consistent naming for PXE ROMs Add ipxe submodule Conflicts: Makefile Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 4ec9b844c..e37e437cc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,3 +7,6 @@
[submodule "roms/SLOF"]
path = roms/SLOF
url = git://git.qemu.org/SLOF.git
+[submodule "roms/ipxe"]
+ path = roms/ipxe
+ url = git://git.qemu.org/ipxe.git