Commit Graph

13 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 52ddf4d91b Merge git://git.sysmocom.de/poky/meta-sysmocom-bsp into edison
e518a3224a
2013-03-02 17:06:31 +01:00
Holger Hans Peter Freyther a060c5d2ab Merge commit '489f392cc63daf1487f4480ebc96a46652766db4' into edison 2013-02-07 15:45:01 +01:00
Holger Hans Peter Freyther db8e4ec0e4 Merge commit '8b61400347f7276fe74b851eb85f3df1270b6ef9' into edison 2013-01-15 13:54:32 +01:00
Holger Hans Peter Freyther 738df59de8 Merge commit 'b92f71e94bd0c8b74e191dac72f69e20fd6edcc4' into edison 2013-01-14 01:19:47 +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 4cfac93114 Merge commit '4df56218263913830d71b4c48be866279702c78a' into edison 2012-07-09 16:20:06 +02:00
Holger Hans Peter Freyther 5d46944934 Merge commit 'e423b30a83bf4ad14a0a3db619faccd979aa4573' into edison 2012-07-09 14:51:12 +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