Commit Graph

3 Commits

Author SHA1 Message Date
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
Holger Hans Peter Freyther 91523445fc Merge commit 'dbb57efcd13952e8a095c902f6cb81eb1e0deda0' into edison 2012-12-18 15:43:35 +01:00
Holger Hans Peter Freyther 0f4626d2d8 Merge git://git.sysmocom.de/poky/meta-sysmocom-bsp into edison 2012-09-15 18:26:29 +02:00