Merge branch 'for-upstream' of git://git.serverraum.org/git/mw/qemu-lm32
authorBlue Swirl <blauwirbel@gmail.com>
Sat, 8 Oct 2011 15:40:08 +0000 (15:40 +0000)
committerBlue Swirl <blauwirbel@gmail.com>
Sat, 8 Oct 2011 15:40:08 +0000 (15:40 +0000)
* 'for-upstream' of git://git.serverraum.org/git/mw/qemu-lm32:
  milkymist: new interrupt map
  milkymist_uart: support new core version
  lm32: add missing qemu_init_vcpu() call

1  2 
trace-events

diff --cc trace-events
Simple merge