diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-18 10:18:26 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-06-18 10:18:26 -0500 |
| commit | 49023ff78cf1efeb861b475c40dd04262efe61d3 (patch) | |
| tree | 4062e4d695289cb3c3424123b0624dc5216bb4ad /target-i386/arch_memory_mapping.c | |
| parent | eb2aeacf983a2a88a2b31e8fee067c38bd10abd3 (diff) | |
| parent | fc0608ac144c4b283c38ce5713bd1efa28c60018 (diff) | |
| download | focaccia-qemu-49023ff78cf1efeb861b475c40dd04262efe61d3.tar.gz focaccia-qemu-49023ff78cf1efeb861b475c40dd04262efe61d3.zip | |
Merge remote-tracking branch 'sweil/for-anthony' into staging
* sweil/for-anthony: Fix some more license versions (GPL2+ instead of GPL2) dump: Fix license version (GPL2+ instead of GPL2) configure: Fix build for some versions of glibc (9pfs) monitor: Fix memory leak with readline completion
Diffstat (limited to 'target-i386/arch_memory_mapping.c')
| -rw-r--r-- | target-i386/arch_memory_mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target-i386/arch_memory_mapping.c b/target-i386/arch_memory_mapping.c index efb0211fdc..8e5a56a3a8 100644 --- a/target-i386/arch_memory_mapping.c +++ b/target-i386/arch_memory_mapping.c @@ -6,8 +6,8 @@ * Authors: * Wen Congyang <wency@cn.fujitsu.com> * - * This work is licensed under the terms of the GNU GPL, version 2. See - * the COPYING file in the top-level directory. + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. * */ |