summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2009-10-18 01:45:36 -0200
committerMarcelo Tosatti <mtosatti@redhat.com>2009-10-18 01:45:36 -0200
commit42a6f56f1d96574bb3ba093c740fb1e23446ea24 (patch)
treede077ffb968b3afb6c1edf9739336219d55e37e6 /qemu-kvm-x86.c
parentFix compile warning in net_tap_fd_init (diff)
parentMerge commit '5afe3f042ae34a2645684d932a584aed980c045f' into upstream-merge (diff)
downloadqemu-kvm-42a6f56f1d96574bb3ba093c740fb1e23446ea24.tar.gz
qemu-kvm-42a6f56f1d96574bb3ba093c740fb1e23446ea24.tar.bz2
qemu-kvm-42a6f56f1d96574bb3ba093c740fb1e23446ea24.zip
Merge branch 'upstream-merge'
* upstream-merge: Only IDE needs limits for CHS configuration MIPS jazz: create isa bus ksm support multiboot: Limit number of multiboot modules pcnet: Extend hardware reset multiboot: Fix cmdline of modules qcow2: Bring synchronous read/write back to life Documentation: Move msmouse description to an appropriate place Documentation: Add missing tags to placeholders Documentation: Highlight placeholders in suboptions net: fix multiple NICs causing net opts process to stop Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'qemu-kvm-x86.c')
0 files changed, 0 insertions, 0 deletions