diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-21 09:38:27 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-02-21 09:38:27 -0600 |
| commit | 259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f (patch) | |
| tree | 017cba36bb8b71b7b2207300403d13f37d0edf8f /.gitignore | |
| parent | cc2832a51c8ce43349967ab1b6c7aafd510e55b2 (diff) | |
| parent | 159c9836d057d8990e71399e8a431b2b911e2885 (diff) | |
| download | qemu-259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f.zip qemu-259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f.tar.gz qemu-259dc0c1ce8eef14e5e0c349bc68ba05c9d5d82f.tar.bz2 | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
# By Alin Tomescu (1) and others
# Via Stefan Hajnoczi
* stefanha/trivial-patches:
.gitignore: Ignore optionrom/*.asm
ppc: fix bamboo >256MB RAM initialization in hw/ppc4xx_devs.c
Add some missing qtest binaries to .gitignore
xilinx_axienet.c: Assert no error when making link
Remove forward declaration of non-existant variable
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -83,12 +83,15 @@ fsdev/virtfs-proxy-helper.pod patches pc-bios/bios-pq/status pc-bios/vgabios-pq/status +pc-bios/optionrom/linuxboot.asm pc-bios/optionrom/linuxboot.bin pc-bios/optionrom/linuxboot.raw pc-bios/optionrom/linuxboot.img +pc-bios/optionrom/multiboot.asm pc-bios/optionrom/multiboot.bin pc-bios/optionrom/multiboot.raw pc-bios/optionrom/multiboot.img +pc-bios/optionrom/kvmvapic.asm pc-bios/optionrom/kvmvapic.bin pc-bios/optionrom/kvmvapic.raw pc-bios/optionrom/kvmvapic.img |