Commit Graph

16 Commits

Author SHA1 Message Date
Daniel Willmann 60560d74b8 Merge commit '315f10aa4759abb627f39122503874e7006db8b1' into dora 2017-06-02 15:01:44 +02:00
Neels Hofmeyr a526dd123e Merge commit '29dd84c82a756afcc44209f89fd2fd0d77307d73' into dora 2016-12-06 15:35:22 +01:00
Holger Hans Peter Freyther ba68c05621 Merge commit 'f3ffbf4db3a4a6a8c375e44c8d03f63bd4851afb' into dora 2016-03-23 12:00:39 +01:00
Holger Hans Peter Freyther 904f600a85 Merge commit 'ebf4952e889c88853813c5f6ae1bbd50accc2683' into dora 2015-12-26 19:03:25 +01:00
Holger Hans Peter Freyther 87183b8b71 Merge commit '04093241861f665ca3a7e47c5706be16269a4b9b' into dora 2015-11-27 11:03:19 +01:00
Harald Welte 2c7144acfe Merge commit '970fe3d755034e53878e8ec2041417f4e400124e' into dora 2015-08-01 18:28:57 +02:00
Holger Hans Peter Freyther 11808b7330 Merge commit '17a8ba8c038aac23bd7cadbc6ed786c72adbb350' into dora 2015-06-24 13:21:16 +02:00
Holger Hans Peter Freyther c09363a966 Merge commit '29faf705ed31e2bf30be8cc0064f26be1851fcc3' into dora 2015-06-23 16:36:22 +02:00
Holger Hans Peter Freyther ad81ff7de9 Merge commit 'bf472b1799a81f46ef0598efd31e64618b8f0730' into dora 2015-05-13 09:33:27 +02:00
Harald Welte bd6709ae21 Merge commit '809e9cd999f670950d250b1097a423a4f08fd8a4' into dora 2015-05-03 11:38:12 +02:00
Holger Hans Peter Freyther 121891e463 Merge commit '9bd8feb83c1e5259ef705cc641cc968362a04fe6' into dora 2015-04-14 15:10:28 +02:00
Holger Hans Peter Freyther 05216f5a96 Merge commit '8e95d188c5597485b54e3fac8210ea532e221870' into dora 2015-04-10 15:30:44 +02:00
Holger Hans Peter Freyther 436d02dfa6 Merge commit '1f660fd4b00076baa867a75fdf766e8fe2c75b9d' into dora 2015-03-31 17:08:27 +02:00
Holger Hans Peter Freyther 268f92b383 Add 'meta-sysmocom-bsp/' from commit 'ab0b6f424807bb42a2c2d3aab5c0e59478ef7d5a'
git-subtree-dir: meta-sysmocom-bsp
git-subtree-mainline: 91638a2adc
git-subtree-split: ab0b6f4248
2014-07-30 17:25:36 +02:00
Holger Hans Peter Freyther 1994264eba misc: Remove layers merged with subtree merges
Subtree merges are horrible broken and subtree is now back and we can
start using it.
2014-07-30 17:22:38 +02:00
Holger Hans Peter Freyther 4a43b3096e Merge remote-tracking branch 'meta-sysmocom-bsp/master' into dora 2014-03-28 11:42:06 +01:00