Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Conflicts:
	cpu-all.h

1 files changed, 1 insertions, 1 deletions

diff --git a/hw/pci.h b/hw/pci.h
index c6a6eb67b6..0d288ce000 100644
--- a/hw/pci.h
+++ b/hw/pci.h
@@ -132,7 +132,7 @@ struct PCIDevice {
     /* PCI config space */
     uint8_t *config;
 
-    /* Used to enable config checks on load. Note that writeable bits are
+    /* Used to enable config checks on load. Note that writable bits are
      * never checked even if set in cmask. */
     uint8_t *cmask;