From: Peter Maydell Date: Fri, 23 Jun 2017 14:40:09 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/queue/misc-pull-request' into staging X-Git-Tag: v2.10.0-rc0~112 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e499ff0707b14066158676623674253bd1153fc6;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'remotes/kraxel/tags/queue/misc-pull-request' into staging # gpg: Signature made Fri 23 Jun 2017 13:48:04 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # 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/queue/misc-pull-request: applesmc: fix port i/o access width applesmc: implement error status port applesmc: cosmetic whitespace and indentation cleanup Signed-off-by: Peter Maydell --- e499ff0707b14066158676623674253bd1153fc6