summaryrefslogtreecommitdiffstats
path: root/util/bitmap.c
diff options
context:
space:
mode:
authorPeter Maydell2015-09-11 13:07:29 +0200
committerPeter Maydell2015-09-11 13:07:29 +0200
commitba9cef7b6e487a5a8969db81d09b8eec8a2b50c6 (patch)
tree5d864537d44177d855b5af77934e860b0d484ec5 /util/bitmap.c
parentMerge remote-tracking branch 'remotes/sstabellini/tags/xen-2015-09-10-tag' in... (diff)
parentvirtio-vga: enable for i386 (diff)
downloadqemu-ba9cef7b6e487a5a8969db81d09b8eec8a2b50c6.tar.gz
qemu-ba9cef7b6e487a5a8969db81d09b8eec8a2b50c6.tar.xz
qemu-ba9cef7b6e487a5a8969db81d09b8eec8a2b50c6.zip
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-09-11' into staging
trivial patches for 2015-09-11 # gpg: Signature made Fri 11 Sep 2015 12:02:43 BST using RSA key ID A4C3D7DB # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" # gpg: aka "Michael Tokarev <mjt@corpit.ru>" # gpg: aka "Michael Tokarev <mjt@debian.org>" * remotes/mjt/tags/pull-trivial-patches-2015-09-11: (26 commits) virtio-vga: enable for i386 hw/arm/spitz: Remove meaningless blank Property hw/gpio/zaurus: Remove meaningless blank Property hw/virtio/virtio-pci: Remove meaningless blank Property hw/s390x/s390-virtio-bus: Remove meaningless blank Property typofixes - v4 qapi-schema: remove legacy<> from doc disas/microblaze: Remove unused code help: dd missing newline Target-ppc: Remove unnecessary variable baum: Fix build with debugging enabled linux-user: Fix warnings caused by missing 'static' attribute opts: produce valid command line in qemu_opts_print docs: fix a qga/qapi-schema.json comment trivial: remove trailing newline from error_report maint: avoid useless "if (foo) free(foo)" pattern maint: avoid useless "if (foo) free(foo)" pattern maint: remove unused include for strings.h maint: remove unused include for signal.h maint: remove unused include for dirent.h ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'util/bitmap.c')
-rw-r--r--util/bitmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/util/bitmap.c b/util/bitmap.c
index 300a68e38c..44f0f481be 100644
--- a/util/bitmap.c
+++ b/util/bitmap.c
@@ -14,7 +14,7 @@
#include "qemu/atomic.h"
/*
- * bitmaps provide an array of bits, implemented using an an
+ * bitmaps provide an array of bits, implemented using an
* array of unsigned longs. The number of valid bits in a
* given bitmap does _not_ need to be an exact multiple of
* BITS_PER_LONG.