Merge commit 'juri/juha-devel' into test

diff --cc hw/omap3.c
index 04fe759,a3edfd2..7895ba0
--- 1/hw/omap3.c
--- 2/hw/omap3.c
+++ b/hw/omap3.c
@@@ -28,8 -28,9 +28,9 @@@
  #include "flash.h"\r
  #include "soc_dma.h"\r
  #include "audio/audio.h"\r
+ #include "block.h"\r
  \r
 -#define OMAP3_DEBUG_\r
 +//#define OMAP3_DEBUG_\r
  \r
  #ifdef OMAP3_DEBUG_\r
  #define TRACE(fmt, ...) fprintf(stderr, "%s " fmt "\n", __FUNCTION__, ##__VA_ARGS__)\r

diff --cc hw/twl4030.c
Simple merge