Commit Graph

12 Commits

Author SHA1 Message Date
Holger Hans Peter Freyther 74b543bbb1 Merge commit '83edf1dce4ab2a5ae143d0a687c9512d2d1767ff' into edison 2013-10-06 17:08:30 +02:00
Holger Hans Peter Freyther 44c4b09e83 Merge commit '57cc5e9c588d4f9f39f5007afdcaf94a830d1401' into edison 2013-08-01 19:50:24 +02:00
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 87a6d04505 Merge commit '557e1b47baeefe01d261092222dadfb67e6d3c56' into edison 2013-01-29 15:26:40 +01:00
Holger Hans Peter Freyther 0b9c954d0b Merge commit 'fd02a175f62968f8ecc4275c590e2d8fce6ac1cf' into edison 2013-01-15 14:11:30 +01:00
Holger Hans Peter Freyther 02f61cf522 Merge commit 'f36b6907a9948411b3e35876279773ef14dfe0e7' into edison 2012-12-21 18:40:24 +01: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
Holger Hans Peter Freyther 46ea81ade5 Merge commit 'd6415c8069714519ab242f7bb1d493d7744529cb' into edison 2012-09-15 15:37:19 +02:00
Holger Hans Peter Freyther a641873503 Merge commit '4e2ab7017f80c42a2b112693fa589ac29cee405d' into edison 2012-08-15 09:17:30 +02:00
Holger Hans Peter Freyther 4d8fef32c9 Merge commit 'e568fa2c271a13144811c62fedc72977df8ad9e8' into edison 2012-07-09 10:40:59 +02:00
Holger Hans Peter Freyther a7befd603b Add 'meta-sysmocom-bsp/' from commit '90a211eb560d7c984a444f9697ff1d06e4bca838'
git-subtree-dir: meta-sysmocom-bsp
git-subtree-mainline: 88c1293c49
git-subtree-split: 90a211eb56
2012-06-27 01:10:49 +08:00