From: Peter Maydell Date: Thu, 10 Jan 2019 18:45:23 +0000 (+0000) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/audio-20190110-pull-request' into... X-Git-Tag: v4.0.0-rc0~177 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=291741033f611a4f0bbce3f7c9dead84ce315f96;p=users%2Fdwmw2%2Fqemu.git Merge remote-tracking branch 'remotes/kraxel/tags/audio-20190110-pull-request' into staging audio: two fixes. # gpg: Signature made Thu 10 Jan 2019 09:23:24 GMT # gpg: using RSA key 4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/audio-20190110-pull-request: usb-audio: ignore usb packages with wrong size hw/audio/marvell: Don't include unnecessary i2c.h header file Signed-off-by: Peter Maydell --- 291741033f611a4f0bbce3f7c9dead84ce315f96