tree 3c25bcedc8bceaf355720888604c8c251f3c68c4
parent d76bb73549fcac07524aea5135280ea533a94fd6
parent b1e5fff4afd0c47148b0d9f9341887ae2c3eb9af
author Blue Swirl <blauwirbel@gmail.com> 1364048606 +0000
committer Blue Swirl <blauwirbel@gmail.com> 1364048606 +0000

Merge branch 'for-upstream' of git://github.com/mwalle/qemu

* 'for-upstream' of git://github.com/mwalle/qemu:
  configure: rename OpenGL feature to GLX
  configure: proper OpenGL/GLX probe
  target-lm32: use HELPER() macro
  target-lm32: flush tlb after clearing env
  target-lm32: remove dead code
  target-lm32: fix cmpgui and cmpgeui opcodes
  tests: tcg: lm32: add more test cases
  target-lm32: don't log cpu state in translation
  lm32_uart: fix receive buffering
  milkymist-uart: fix receive buffering
  lm32-dis: fix NULL pointer dereference
  target-lm32: fix debug memory access