From: Anthony Liguori Date: Tue, 25 Jun 2013 19:14:13 +0000 (-0500) Subject: Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=3e5087329489e0beceecf3426f1216619821937f;p=qemu.git Merge remote-tracking branch 'pmaydell/arm-devs.for-upstream' into staging # By Peter Crosthwaite (3) and others # Via Peter Maydell * pmaydell/arm-devs.for-upstream: nand: Don't inherit from Sysbus block/nand: Convert Sysbus::init to Device::realize block/nand: QOM casting sweep i.MX31: Fix PRCS bit test arm/boot: Free dtb blob memory after use i.MX: Rework functions/types name and use new style initialization i.MX: Implement a more complete version of the GPT timer. ARM: Allow dumping of device tree Message-id: 1372184516-32397-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori --- 3e5087329489e0beceecf3426f1216619821937f