diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-31 15:40:39 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-31 15:40:39 +0000 |
| commit | e8977901b79fb678f288dd372261b640bbeccd0d (patch) | |
| tree | a5169c4b7619aaf32317749ac7ca04d93faf6fbe /include/qemu/range.h | |
| parent | aefcd2836620363020d53b18e712a3350116f332 (diff) | |
| parent | 95b3c9cfd5eaaa4a2a4afa1eaf09612a94ade1da (diff) | |
| download | focaccia-qemu-e8977901b79fb678f288dd372261b640bbeccd0d.tar.gz focaccia-qemu-e8977901b79fb678f288dd372261b640bbeccd0d.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-pull-request' into staging
- add device category (edu, i8042, sd memory card) - code clean-up - LGPL information clean-up - fix typo (acpi) # gpg: Signature made Wed 30 Jan 2019 13:21:50 GMT # gpg: using RSA key F30C38BD3F2FBE3C # gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full] # gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full] # gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full] # Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C * remotes/vivier2/tags/trivial-branch-pull-request: virtio-blk: remove duplicate definition of VirtIOBlock *s pointer hw/block: clean up stale xen_disk trace entries target/m68k: Fix LGPL information in the file headers target/s390x: Fix LGPL version in the file header comments tcg: Fix LGPL version number target/tricore: Fix LGPL version number target/openrisc: Fix LGPL version number COPYING.LIB: Synchronize the LGPL 2.1 with the version from gnu.org Don't talk about the LGPL if the file is licensed under the GPL hw: sd: set category of the sd memory card hw: input: set category of the i8042 device typo: apci->acpi hw: edu: set category of the edu device Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/qemu/range.h')
| -rw-r--r-- | include/qemu/range.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/include/qemu/range.h b/include/qemu/range.h index ba606c6bc0..71b8b215c6 100644 --- a/include/qemu/range.h +++ b/include/qemu/range.h @@ -3,19 +3,18 @@ * * Copyright (c) 2015-2016 Red Hat, Inc. * - * This library is free software; you can redistribute it and/or + * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public * License as published by the Free Software Foundation; either * version 2 of the License, or (at your option) any later version. * - * This library is distributed in the hope that it will be useful, + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/>. + * General Public License for more details. * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. */ #ifndef QEMU_RANGE_H |