Merge branch 'upstream' into maemo-test
authorRiku Voipio <riku.voipio@nokia.com>
Thu, 19 Feb 2009 14:52:18 +0000 (16:52 +0200)
committerRiku Voipio <riku.voipio@nokia.com>
Thu, 19 Feb 2009 14:52:18 +0000 (16:52 +0200)
commit9da8a7879401e8d1b1287981589faf3c62fd94db
tree0761f752735664e5acefd975a5241cce80c75219
parent7d007469c22ca5de89059c9a1721d1680678ad94
parent176050719287eb73f6ff8610843cbcbbb0ae388b
Merge branch 'upstream' into maemo-test

Resolve conflicts

Conflicts:

.gitignore
hw/omap_dss.c
linux-user/main.c
linux-user/syscall.c
21 files changed:
Makefile.target
bsd-user/main.c
configure
darwin-user/main.c
hw/blizzard.c
hw/boards.h
hw/i2c.h
hw/nseries.c
hw/omap.h
hw/omap1.c
hw/omap2.c
hw/omap3.c
hw/omap_dss.c
linux-user/main.c
linux-user/mmap.c
linux-user/signal.c
linux-user/syscall.c
linux-user/syscall_defs.h
target-arm/cpu.h
target-arm/helper.c
target-arm/translate.c