Merge branch 'master' of rtime.felk.cvut.cz:jailhouse

Conflicts:
	configs/novabox.c

diff --cc configs/novabox.c
index 18656ff7f69ae057c674a8031991807ad86f54dc,05ae7f3466fceb60838910f90bdae162fcc7830c..f9522b0f56d9404cc0daf5beae1214537884eded
--- 1/configs/novabox.c
--- 2/configs/novabox.c
+++ b/configs/novabox.c
@@@ -63,10 -63,10 +63,17 @@@ struct 
                        .mmconfig_base = 0xf8000000,
                        .mmconfig_end_bus = 0x3f,
                        .pm_timer_address = 0x408,
++<<<<<<< HEAD
 +                       .iommu_base = {
 +                              0xfed90000,
 +                              0xfed91000,
 +                       },
++=======
+                       .iommu_base = {
+                               0xfed90000,
+                               0xfed91000,
+                       },
++>>>>>>> 11dff97feece0823144bbe800b9e56c6995cd2fb
                },
                .device_limit = 128,
                .interrupt_limit = 256,