aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CREDITS8
-rw-r--r--MAINTAINERS7
2 files changed, 15 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index dede114d046e..d7140309e06d 100644
--- a/CREDITS
+++ b/CREDITS
@@ -3301,6 +3301,14 @@ 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
3304N: Marcelo Tosatti 3312N: Marcelo Tosatti
3305E: marcelo@kvack.org 3313E: marcelo@kvack.org
3306D: v2.4 kernel maintainer 3314D: v2.4 kernel maintainer
diff --git a/MAINTAINERS b/MAINTAINERS
index 6a8924d2c718..83896d82128f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1388,6 +1388,13 @@ L: linuxppc-embedded@ozlabs.org
1388L: netdev@vger.kernel.org 1388L: netdev@vger.kernel.org
1389S: Maintained 1389S: Maintained
1390 1390
1391FREESCALE HIGHSPEED USB DEVICE DRIVER
1392P: Li Yang
1393M: leoli@freescale.com
1394L: linux-usb-devel@lists.sourceforge.net
1395L: linuxppc-embedded@ozlabs.org
1396S: Maintained
1397
1391FILE LOCKING (flock() and fcntl()/lockf()) 1398FILE LOCKING (flock() and fcntl()/lockf())
1392P: Matthew Wilcox 1399P: Matthew Wilcox
1393M: matthew@wil.cx 1400M: matthew@wil.cx