Merge branch 'master' into raspi (no conflicts)
commit60e8951cff845c91196fd2032ea91dbcae0be293
authorAndrew Baumann <Andrew.Baumann@microsoft.com>
Tue, 17 Nov 2015 17:26:14 +0000 (17 09:26 -0800)
committerAndrew Baumann <Andrew.Baumann@microsoft.com>
Tue, 17 Nov 2015 17:26:14 +0000 (17 09:26 -0800)
treed38bb70f784d130d3268171bb787465c87f0151f
parente84a0de4f6d5cfd2c30175809c574386b28c5d0a
parentc27e9014d56fa4880e7d741275d887c3a5949997
Merge branch 'master' into raspi (no conflicts)
hw/misc/Makefile.objs
target-arm/translate.c