diff options
| author | Peter Maydell | 2019-01-31 16:40:39 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-31 16:40:39 +0100 |
| commit | e8977901b79fb678f288dd372261b640bbeccd0d (patch) | |
| tree | a5169c4b7619aaf32317749ac7ca04d93faf6fbe /include/hw/pci-host | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/usb-20190130-pull-request' ... (diff) | |
| parent | virtio-blk: remove duplicate definition of VirtIOBlock *s pointer (diff) | |
| download | qemu-e8977901b79fb678f288dd372261b640bbeccd0d.tar.gz qemu-e8977901b79fb678f288dd372261b640bbeccd0d.tar.xz 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/hw/pci-host')
| -rw-r--r-- | include/hw/pci-host/gpex.h | 4 | ||||
| -rw-r--r-- | include/hw/pci-host/q35.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/hw/pci-host/gpex.h b/include/hw/pci-host/gpex.h index aef38b881b..2af1c4a37e 100644 --- a/include/hw/pci-host/gpex.h +++ b/include/hw/pci-host/gpex.h @@ -13,8 +13,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/> + * 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 HW_GPEX_H diff --git a/include/hw/pci-host/q35.h b/include/hw/pci-host/q35.h index 8f4ddde393..5ed77facd0 100644 --- a/include/hw/pci-host/q35.h +++ b/include/hw/pci-host/q35.h @@ -15,8 +15,8 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, see <http://www.gnu.org/licenses/> + * 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 HW_Q35_H |