diff options
author | George Nita <george.nita@enea.com> | 2015-09-30 05:12:02 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2015-09-30 05:12:02 +0200 |
commit | 9e4c491105d191b064614d9255f467d552ea3362 (patch) | |
tree | ef1fb0171d8e087a7d4f7d1b04a8d9b59c522801 /MAINTAINERS | |
parent | 584147c3832229a6165c52b87138919926a74498 (diff) | |
parent | 84c049b9cb80b50fd32b716c2ae97e3f0d4e3cd7 (diff) | |
download | meta-intel-9e4c491105d191b064614d9255f467d552ea3362.tar.gz |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 233fa2eb..79a021dc 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -35,10 +35,6 @@ CRYSTALFOREST | |||
35 | M: Wu Chia Chuan <chia.chuan.wu@intel.com> | 35 | M: Wu Chia Chuan <chia.chuan.wu@intel.com> |
36 | F: meta-crystalforest/ | 36 | F: meta-crystalforest/ |
37 | 37 | ||
38 | ROMLEY | ||
39 | M: Wu Chia Chuan <chia.chuan.wu@intel.com> | ||
40 | F: meta-romley/ | ||
41 | |||
42 | TLK | 38 | TLK |
43 | M: Saul Wold <sgw@linux.intel.com> | 39 | M: Saul Wold <sgw@linux.intel.com> |
44 | F: meta-tlk/ | 40 | F: meta-tlk/ |