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 a641873503 Merge commit '4e2ab7017f80c42a2b112693fa589ac29cee405d' into edison 2012-08-15 09:17:30 +02:00