Merge remote-tracking branch 'remotes/kraxel/tags/queue/misc-pull-request' into staging
commite499ff0707b14066158676623674253bd1153fc6
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 23 Jun 2017 14:40:09 +0000 (23 15:40 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 23 Jun 2017 14:40:09 +0000 (23 15:40 +0100)
treee17964b18abff083321744a0b5bb4d86105baba1
parente47ec1a9ba1cd239e66733fd8d55dfa3261a9de6
parent1b8274d4f926836a4c773c310318e6039c4794a1
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) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# 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 <peter.maydell@linaro.org>