]> git.proxmox.com Git - qemu.git/commitdiff
Merge branch 'axp-next' of git://github.com/rth7680/qemu
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 19 Jan 2013 09:54:31 +0000 (09:54 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 19 Jan 2013 09:54:31 +0000 (09:54 +0000)
* 'axp-next' of git://github.com/rth7680/qemu:
  alpha-linux-user: Correct select
  alpha-linux-user: Translate fcntl l_type


Trivial merge