From: Anthony Liguori Date: Mon, 3 Jun 2013 18:24:25 +0000 (-0500) Subject: Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging X-Git-Tag: v1.6.0-rc0~256 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0ded1fe5f36765b97b15a7afebb6d04ddcc4771c;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'pmaydell/arm-devs.next' into staging # By Peter Crosthwaite (20) and others # Via Peter Maydell * pmaydell/arm-devs.next: (24 commits) i.MX: Improve EPIT timer code. exynos4210.c: register rom_mem for memory migration hw/arm/exynos4210.c: convert chipid_and_omr to an mmio region i.MX: split GPT and EPIT timer implementation sd/sd.c: Fix "inquiry" ACMD41 sd/sdhci:ADMA: fix interrupt sd/sdhci.c: Fix bdata_read DPRINT message sd/sdhci: Fix Buffer Write Ready interrupt sd/sdhci.c: Only reset data_count on new commands xilinx_spips: lqspi: Fix byte/misaligned access xilinx_spips: lqspi: Push more data to tx-fifo xilinx_spips: Multiple debug verbosity levels xilinx_spips: Debug msgs for Snoop state xilinx_spips: Fix striping behaviour xilinx_spips: Fix CTRL register RW bits xilinx_spips: lqspi: Dont touch config register xilinx_spips: Implement automatic CS xilinx_spips: Add automatic start support xilinx_spips: Trash LQ page cache on mode change xilinx_spips: Fix QSPI FIFO size ... Message-id: 1370277021-26129-1-git-send-email-peter.maydell@linaro.org Signed-off-by: Anthony Liguori --- 0ded1fe5f36765b97b15a7afebb6d04ddcc4771c