From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Thu, 12 May 2016 00:49:40 +0000 (+0200)
Subject: Merge branch 'master' of rtime.felk.cvut.cz:jailhouse
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/jailhouse.git/commitdiff_plain/ae2a533e75d6ae6fb503266a65b267dbcd9e76f6

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

Conflicts:
	configs/novabox.c
---

ae2a533e75d6ae6fb503266a65b267dbcd9e76f6
diff --cc configs/novabox.c
index 18656ff,05ae7f3..f9522b0
--- a/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,