Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf
commit27a9476cf75c4e147cb7d8c10c415928b3791b91
authorBlue Swirl <blauwirbel@gmail.com>
Mon, 5 Mar 2012 18:55:11 +0000 (5 18:55 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Mon, 5 Mar 2012 18:55:11 +0000 (5 18:55 +0000)
treec203e4dd1676f6f9329e4f0f3a5a0bcfcc3e73a5
parenta2d335214a53b0cc6f7a4a2009d842bea1958085
parent3208afbe04ad976e038fdb55d11f9f90629a5217
Merge branch 's390-for-upstream' of git://repo.or.cz/qemu/agraf

* '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