Failed in applying to current master (
apply log)
hw/dma/sparc32_dma.c | 25 ++++++++++++--------
hw/dma/sun4m_iommu.c | 12 ++++------
hw/misc/eccmemctl.c | 25 ++++++++++++--------
hw/misc/slavio_misc.c | 43 ++++++++++++++--------------------
hw/sparc/sun4m.c | 54 +++++++++++++++----------------------------
hw/sparc64/sun4u.c | 20 ++++++++--------
hw/timer/m48t59.c | 61 ++++++++++++++++++++++++++++++++++---------------
hw/timer/slavio_timer.c | 12 ++++------
8 files changed, 128 insertions(+), 124 deletions(-)