From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 19 Jan 2013 09:54:31 +0000 (+0000)
Subject: Merge branch 'axp-next' of git://github.com/rth7680/qemu
X-Git-Tag: v1.4.0-rc0~151
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=48b8599c991715eeae74f0cb650fc4284cb69227;p=users%2Fdwmw2%2Fqemu.git

Merge branch 'axp-next' of git://github.com/rth7680/qemu

* 'axp-next' of git://github.com/rth7680/qemu:
  alpha-linux-user: Correct select
  alpha-linux-user: Translate fcntl l_type
---

48b8599c991715eeae74f0cb650fc4284cb69227