summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-12-24 15:07:32 -0200
committerMarcelo Tosatti <mtosatti@redhat.com>2009-12-24 15:07:32 -0200
commit0d27b377038ca3f2400d6f850d7852d3bf9ed576 (patch)
tree1d4d879223b0840c5f88ede62e1ddf984419aac7 /.gitignore
parentef11086bedfeda6fd93794fe417fc95381808bae (diff)
parent502e64fe23f19c086d42f6178cdda19e58996080 (diff)
Merge commit '502e64fe23f19c086d42f6178cdda19e58996080' into upstream-merge
* commit '502e64fe23f19c086d42f6178cdda19e58996080': (23 commits) target-arm: fix strexd linux-user: fix build with gcc-4.1 linuxboot.bin is a generated file qemu-nbd: fix OpenBSD linker warning e1000: add link to data sheet qemu-io: suppress a warning with gcc 4.0.2 Compile qemu-nbd also on OpenBSD and Solaris USB: Improve usbdevice error messages target-alpha: Initialize fpcr tcg-sparc: Implement brcond2. tcg-sparc: Use TCG_TARGET_REG_BITS in conditional compilation. tcg-sparc: Improve tcg_out_movi for sparc64. tcg-sparc: Fix imm13 check in movi. ARM PBX-A9 memory map tweaks LAN9118 improvements PPC: Make DCR uint32_t PPC64: Fix alternate timebase PPC64: Fix timebase target-alpha: Emit tcg debug_insn_start. linux-user: Add aliases for some Alpha syscalls ... Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index bbd4d1706..f1337963f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ qemu-monitor.texi
patches
pc-bios/bios-pq/status
pc-bios/vgabios-pq/status
+pc-bios/optionrom/linuxboot.bin
pc-bios/optionrom/multiboot.bin
pc-bios/optionrom/multiboot.raw
pc-bios/optionrom/extboot.bin