Merge branch 'upstream' into master-test
authorRiku Voipio <riku.voipio@nokia.com>
Mon, 20 Apr 2009 14:27:28 +0000 (17:27 +0300)
committerRiku Voipio <riku.voipio@nokia.com>
Mon, 20 Apr 2009 14:27:28 +0000 (17:27 +0300)
commit8fd50abea543d0bcecd9bf79b6a95f29df96656f
tree2f83d26ddaf1a769c4a3e97900e1456d66179964
parentd2dd4d8f0f85b1bde9a9c7541b6db8729ff6c345
parent7545668bfed32b9d544f6484c627817aa0f59f25
Merge branch 'upstream' into master-test

Big, bad, merge

Conflicts:

hw/smc91c111.c
hw/usb-ohci.c
linux-user/main.c
linux-user/syscall.c
20 files changed:
Makefile
Makefile.target
block.c
block.h
exec.c
hw/boards.h
hw/devices.h
hw/gumstix.c
hw/integratorcp.c
hw/mainstone.c
hw/nseries.c
hw/omap_dss.c
hw/onenand.c
hw/realview.c
hw/smc91c111.c
hw/soc_dma.h
hw/usb-ohci.c
hw/versatilepb.c
linux-user/main.c
linux-user/syscall.c