From: Blue Swirl <blauwirbel@gmail.com>
Date: Tue, 30 Oct 2012 18:35:18 +0000 (+0000)
Subject: Merge branch 'qspi.2' of git://developer.petalogix.com/public/qemu
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=742a40229d991d5a1a67baba59f6b1ee85dd41f0;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

Merge branch 'qspi.2' of git://developer.petalogix.com/public/qemu

* 'qspi.2' of git://developer.petalogix.com/public/qemu:
  xilinx_zynq: added QSPI controller
  xilinx_spips: Generalised to model QSPI
  m25p80: Support for Quad SPI
---

742a40229d991d5a1a67baba59f6b1ee85dd41f0