Commit Graph

2 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 46ea81ade5 Merge commit 'd6415c8069714519ab242f7bb1d493d7744529cb' into edison 2012-09-15 15:37:19 +02:00