Merge commit 'gnu/master' into test
authorRiku Voipio <riku.voipio@nokia.com>
Mon, 8 Jun 2009 15:31:58 +0000 (18:31 +0300)
committerRiku Voipio <riku.voipio@nokia.com>
Mon, 8 Jun 2009 15:31:58 +0000 (18:31 +0300)
commit759b334a9739814df2883aa4c41b1c0f5670e90a
tree7bc2bb6a615a32897a0034d418bd6cebeee9b95e
parent7e2198fc87e878b8ce5df965477e21713ebf7834
parent168ccc11c323af885de353d9e045c0c1f78f6f2f
Merge commit 'gnu/master' into test

Epic merge

Conflicts:
Makefile
block.c
block.h
configure
hw/boards.h
hw/flash.h
hw/integratorcp.c
hw/nand.c
hw/omap2.c
hw/omap_i2c.c
hw/sd.c
hw/smc91c111.c
hw/tsc2005.c
hw/tusb6010.c
hw/usb-musb.c
linux-user/syscall.c
target-arm/machine.c
target-arm/translate.c
37 files changed:
Makefile
Makefile.target
configure
cpu-all.h
elf.h
exec.c
hw/beagle.c
hw/blizzard.c
hw/devices.h
hw/flash.h
hw/i2c.h
hw/nand.c
hw/nseries.c
hw/omap.h
hw/omap1.c
hw/omap2.c
hw/omap3_mmc.c
hw/omap3_usb.c
hw/omap_clk.c
hw/omap_dss.c
hw/omap_i2c.c
hw/onenand.c
hw/sd.c
hw/smc91c111.c
hw/tsc2005.c
hw/tusb6010.c
hw/twl4030.c
hw/usb-musb.c
hw/usb-ohci.c
linux-user/elfload.c
linux-user/main.c
linux-user/qemu.h
linux-user/signal.c
linux-user/syscall.c
linux-user/syscall_defs.h
target-arm/machine.c
target-arm/translate.c