]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
authorBlue Swirl <blauwirbel@gmail.com>
Mon, 5 Mar 2012 18:55:11 +0000 (18:55 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Mon, 5 Mar 2012 18:55:11 +0000 (18:55 +0000)
* 's390-for-upstream' of git://repo.or.cz/qemu/agraf:
  Move helpers.h to helper.h
  s390: Rework kernel loading: supports elf and newer kernels


Trivial merge