James Hunt d00dcb20e0 Merge branch 'master' into oci ...

Signed-off-by: James Hunt <james.o.hunt@intel.com>

Conflicts:
	Makefile

2015-10-20 13:37:22 +01:00

..

9p-pdu.c

kvmtool: 9p: teach kvmtool about kuid_t and kgid_t

2015-06-01 16:40:11 +01:00

9p.c

Merge branch 'master' into oci

2015-10-20 13:37:22 +01:00

balloon.c

avoid casts when initializing structures

2015-07-20 18:25:47 +01:00

blk.c

avoid casts when initializing structures

2015-07-20 18:25:47 +01:00

console.c

avoid casts when initializing structures

2015-07-20 18:25:47 +01:00

core.c

Use the arch default transport method for network

2015-06-01 16:39:55 +01:00

mmio.c

kvmtool: ARM: allow level interrupts in device tree

2015-06-01 16:39:55 +01:00

net.c

Merge branch 'master' into clear-patches

2015-10-16 12:33:39 +01:00

pci.c

kvmtool: vhost-net: fix ioeventfd registration

2015-06-29 10:49:45 +01:00

rng.c

avoid casts when initializing structures

2015-07-20 18:25:47 +01:00

scsi.c

avoid casts when initializing structures

2015-07-20 18:25:47 +01:00