]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38c4718 7b482bc)
Merge branch 'qspi.2' of git://developer.petalogix.com/public/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Tue, 30 Oct 2012 18:35:18 +0000 (18:35 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Tue, 30 Oct 2012 18:35:18 +0000 (18:35 +0000)
* '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


Trivial merge
Qemu copy for testing