falso
/
qemu-irix
mirror of https://github.com/n64decomp/qemu-irix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qemu-irix/hw
History
Anthony Liguori b5d54bd421 Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 
* qemu-kvm/uq/master:
  kvm-stub: fix compilation
  kvm: shorten the parameter list for get_real_device()
  kvm: i386: fix LAPIC TSC deadline timer save/restore
  kvm-all.c: max_cpus should not exceed KVM vcpu limit
  kvm: Simplify kvm_handle_io
  kvm: x86: fix setting IA32_FEATURE_CONTROL with nested VMX disabled
  kvm: add KVM_IRQFD_FLAG_RESAMPLE support
  kvm: migrate vPMU state
  target-i386: remove tabs from target-i386/cpu.h
  Initialize IA32_FEATURE_CONTROL MSR in reset and migration

Conflicts:
	target-i386/cpu.h
	target-i386/kvm.c

aliguori: fixup trivial conflicts due to whitespace and added cpu
          argument

Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
 		2013-08-29 17:21:51 -05:00
..
9pfs
…
acpi aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
alpha aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
arm aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
audio aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
block aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
bt aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
char Merge remote-tracking branch 'stefanha/block' into staging 2013-08-26 09:19:50 -05:00
core pc,pci,virtio fixes and cleanups 2013-08-29 17:19:19 -05:00
cpu
…
cris
…
display aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
dma aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
gpio
…
i2c
…
i386 Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 2013-08-29 17:21:51 -05:00
ide aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
input aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
intc aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
isa
…
lm32
…
m68k
…
microblaze
…
mips aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
misc Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 2013-08-29 17:21:51 -05:00
moxie
…
net aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
nvram
…
openrisc Merge remote-tracking branch 'stefanha/block' into staging 2013-08-26 09:19:50 -05:00
pci
…
pci-bridge
…
pci-host
…
ppc pc,pci,virtio fixes and cleanups 2013-08-29 17:19:19 -05:00
s390x
…
scsi
…
sd aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
sh4
…
sparc
…
sparc64 pc,pci,virtio fixes and cleanups 2013-08-29 17:19:19 -05:00
ssi
…
timer aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
tpm aio / timers: Untangle include files 2013-08-22 19:10:27 +02:00
unicore32
…
usb aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
virtio Merge remote-tracking branch 'qemu-kvm/uq/master' into stable-1.5 2013-08-29 17:21:51 -05:00
watchdog aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
xen
…
xtensa aio / timers: Switch entire codebase to the new timer API 2013-08-22 19:14:24 +02:00
Makefile.objs
…