diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-02 10:56:07 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2013-05-02 10:56:07 -0500 |
| commit | 0db4c324a8c6f2b1b8a118146f9b0fc8c4210719 (patch) | |
| tree | 1114cc4d946bf7ab1c5db3cdba6e4dda5b8c4b15 /hw | |
| parent | e9016ee2bda1b7757072b856b2196f691aee3388 (diff) | |
| parent | 6e860b5db4c76c66d7e02f93c9e22e0384bd3c6c (diff) | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Andreas Färber (1) and others
# Via Michael Tokarev
* mjt/trivial-patches:
pvscsi: fix compilation on 32 bit hosts
Trivial grammar and spelling fixes
configure: Pick up libseccomp include path
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/moxie/moxiesim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c index 70bf28f2fd..649f9a7daa 100644 --- a/hw/moxie/moxiesim.c +++ b/hw/moxie/moxiesim.c @@ -1,7 +1,7 @@ /* * QEMU/moxiesim emulation * - * Emulates a very simple machine model similiar to the one use by the + * Emulates a very simple machine model similar to the one used by the * GDB moxie simulator. * * Copyright (c) 2008, 2009, 2010, 2013 Anthony Green |