Holger Hans Peter Freyther f59fe37872 Merge commit '49ca632e9af816b65cd1b0f885fc8c3f4af4cdec' into edison ... Conflicts: meta-sysmocom-bsp/recipes-sysmobts/osmo-bts/osmo-bts_git.bb meta-sysmocom-bsp/recipes-sysmobts/osmo-pcu/osmo-pcu_git.bb		2013-05-27 17:48:04 +02:00
..
machine	Merge commit '49ca632e9af816b65cd1b0f885fc8c3f4af4cdec' into edison	2013-05-27 17:48:04 +02:00
layer.conf	Merge git://git.sysmocom.de/poky/meta-sysmocom-bsp into edison	2012-09-15 18:26:29 +02:00