Merge remote-tracking branch 'afaerber-or/prep-up' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 6 May 2013 11:49:51 +0000 (06:49 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 6 May 2013 11:49:51 +0000 (06:49 -0500)
commite4b006b7a5bce59d4f692d5da04eede5f6d0f31c
tree5ac41011104a39f7dd85b74fb640658199d31020
parent1e65fe536782132316ddae0a92f3c4e4f563cafb
parentb6f54b31e7cfb2e88b76fc6cfc5334a26d1b9e53
Merge remote-tracking branch 'afaerber-or/prep-up' into staging

# By Andreas Färber (1) and others
# Via Andreas Färber
* afaerber-or/prep-up:
  prep: Make System I/O port 0092 read/write
  prep: Add ELF support for -bios
  prep: Fix NIP reset value