summary refs log tree commit diff stats
path: root/qemu-timer.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-02-20 11:55:37 +0000
committerPeter Maydell <peter.maydell@linaro.org>2017-02-20 11:55:37 +0000
commit5d42ff913bb294c661aed8dfcd386fed9e185148 (patch)
treedc2d51e4acfc1cde0509dfb33cdf3308b22b544f /qemu-timer.c
parentd514cfd763b271b4e97a9fc6adaabc8fd50084ab (diff)
parent5baf2741b4920c3227c14734986893c66b6b2eed (diff)
downloadfocaccia-qemu-5d42ff913bb294c661aed8dfcd386fed9e185148.tar.gz
focaccia-qemu-5d42ff913bb294c661aed8dfcd386fed9e185148.zip
Merge remote-tracking branch 'remotes/huth/tags/coldfire-20170219' into staging
Updates for the m68k ColdFire machines:
- Remove the obsolete dummy machine
- QOMify the ColdFire interrupt controller
- Volunteer for maintaining the orphan ColdFire boards

# gpg: Signature made Sat 18 Feb 2017 23:08:55 GMT
# gpg:                using RSA key 0x2ED9D774FE702DB5
# gpg: Good signature from "Thomas Huth <th.huth@gmx.de>"
# gpg:                 aka "Thomas Huth <thuth@redhat.com>"
# gpg:                 aka "Thomas Huth <huth@tuxfamily.org>"
# Primary key fingerprint: 27B8 8847 EEE0 2501 18F3  EAB9 2ED9 D774 FE70 2DB5

* remotes/huth/tags/coldfire-20170219:
  MAINTAINERS: Add odd fixer for the ColdFire boards
  hw/m68k: QOMify the ColdFire interrupt controller
  hw/m68k: Remove dummy machine

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qemu-timer.c')
0 files changed, 0 insertions, 0 deletions