aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS16
1 files changed, 8 insertions, 8 deletions
diff --git a/CREDITS b/CREDITS
index 273d72b610c3..79fd13dbb8e4 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3301,14 +3301,6 @@ S: 12725 SW Millikan Way, Suite 400
3301S: Beaverton, Oregon 97005 3301S: Beaverton, Oregon 97005
3302S: USA 3302S: USA
3303 3303
3304N: Li Yang
3305E: leoli@freescale.com
3306D: Freescale Highspeed USB device driver
3307D: Freescale QE SoC support and Ethernet driver
3308S: B-1206 Jingmao Guojigongyu
3309S: 16 Baliqiao Nanjie, Beijing 101100
3310S: People's Repulic of China
3311
3312N: Marcelo Tosatti 3304N: Marcelo Tosatti
3313E: marcelo@kvack.org 3305E: marcelo@kvack.org
3314D: v2.4 kernel maintainer 3306D: v2.4 kernel maintainer
@@ -3726,6 +3718,14 @@ S: 542 West 112th Street, 5N
3726S: New York, New York 10025 3718S: New York, New York 10025
3727S: USA 3719S: USA
3728 3720
3721N: Li Yang
3722E: leoli@freescale.com
3723D: Freescale Highspeed USB device driver
3724D: Freescale QE SoC support and Ethernet driver
3725S: B-1206 Jingmao Guojigongyu
3726S: 16 Baliqiao Nanjie, Beijing 101100
3727S: People's Repulic of China
3728
3729N: Victor Yodaiken 3729N: Victor Yodaiken
3730E: yodaiken@fsmlabs.com 3730E: yodaiken@fsmlabs.com
3731D: RTLinux (RealTime Linux) 3731D: RTLinux (RealTime Linux)