diff options
author | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-17 10:21:42 -0500 |
---|---|---|
committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-17 10:21:42 -0500 |
commit | 509e9c462d03c4b7edc4a0d277311a7f45c9c046 (patch) | |
tree | f081154c44f3836f25502d654ade6e011ea7125e /hw/imx_timer.c | |
parent | cd6dcc710541dd39504f47a5c258f14a762bb767 (diff) | |
parent | e84d5956cc6215d2f098e7b6090fc5ec4cba1be3 (diff) | |
download | qemu-509e9c462d03c4b7edc4a0d277311a7f45c9c046.tar.gz |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
configure: fix seccomp check
arch_init.c: add missing '%' symbols before PRIu64 in debug printfs
kvm: Fix warning from static code analysis
qapi: Fix enumeration typo error
console: Clean up bytes per pixel calculation
Fix copy&paste typos in documentation comments
linux-user: Remove #if 0'd cpu_get_real_ticks() definition
ui: Fix spelling in comment (ressource -> resource)
Spelling fixes in comments and macro names (ressource -> resource)
Fix spelling (licenced -> licensed) in GPL
Spelling fixes in comments and documentation
srp: Don't use QEMU_PACKED for single elements of a structured type
Diffstat (limited to 'hw/imx_timer.c')
-rw-r--r-- | hw/imx_timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/imx_timer.c b/hw/imx_timer.c index 16215ccf04..c28c53725a 100644 --- a/hw/imx_timer.c +++ b/hw/imx_timer.c @@ -3,10 +3,10 @@ * * Copyright (c) 2008 OK Labs * Copyright (c) 2011 NICTA Pty Ltd - * Originally Written by Hans Jiang + * Originally written by Hans Jiang * Updated by Peter Chubb * - * This code is licenced under GPL version 2 or later. See + * This code is licensed under GPL version 2 or later. See * the COPYING file in the top-level directory. * */ |