diff options
author | George Nita <george.nita@enea.com> | 2015-07-24 05:12:29 +0200 |
---|---|---|
committer | George Nita <george.nita@enea.com> | 2015-07-24 05:12:29 +0200 |
commit | 5d1aeecb9512fb2d79bb16c39f00098a7f4d4150 (patch) | |
tree | a7e2093eb8a763a19b82f0fdee3c2a289922dd16 /MAINTAINERS | |
parent | f94b8953cb776b9d0145cecd0795dd442cbeb9f7 (diff) | |
parent | 9aa6c066ebf44aecef40caec333772cd970f6842 (diff) | |
download | meta-intel-5d1aeecb9512fb2d79bb16c39f00098a7f4d4150.tar.gz |
Merge remote-tracking branch 'origin/master' into master-enea
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9c3b3af8..64019636 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -36,7 +36,7 @@ M: Saul Wold <sgw@linux.intel.com> | |||
36 | F: meta-crownbay/ | 36 | F: meta-crownbay/ |
37 | 37 | ||
38 | CRYSTALFOREST | 38 | CRYSTALFOREST |
39 | M: Saul Wold <sgw@linux.intel.com> | 39 | M: Wu Chia Chuan <chia.chuan.wu@intel.com> |
40 | F: meta-crystalforest/ | 40 | F: meta-crystalforest/ |
41 | 41 | ||
42 | EMENLOW | 42 | EMENLOW |
@@ -52,7 +52,7 @@ M: Saul Wold <sgw@linux.intel.com> | |||
52 | F: meta-jasperforest/ | 52 | F: meta-jasperforest/ |
53 | 53 | ||
54 | ROMLEY | 54 | ROMLEY |
55 | M: Haw Foo Chien <foo.chien.haw@intel.com> | 55 | M: Wu Chia Chuan <chia.chuan.wu@intel.com> |
56 | F: meta-romley/ | 56 | F: meta-romley/ |
57 | 57 | ||
58 | SUGARBAY | 58 | SUGARBAY |