---

yaml --- r: 62523 b: refs/heads/master c: 4d2fafd h: refs/heads/master i: 62521: ce81597 62519: 74c4533 v: v3
git-mirror · Jun 2, 2007 · e64682e · e64682e
1 parent dc7c441
commit e64682e
Show file tree

Hide file tree

Showing 6,016 changed files with 280,725 additions and 335,148 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e8b495fe09bc793ae26774e7b2667f7f658d56e2
+refs/heads/master: 4d2fafd17a325b3f4f5f9edb1211bc7f4c311269
diff --git a/trunk/.gitignore b/trunk/.gitignore
@@ -22,7 +22,6 @@
 tags
 TAGS
 vmlinux*
-!vmlinux.lds.S
 System.map
 Module.symvers
 
@@ -46,6 +45,3 @@ series
 
 # cscope files
 cscope.*
-
-*.orig
-*.rej
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -2212,13 +2212,13 @@ S: 2300 Copenhagen S
 S: Denmark
 
 N: Claudio S. Matsuoka
-E: cmatsuoka@gmail.com
-E: claudio@mandriva.com
+E: claudio@conectiva.com
+E: claudio@helllabs.org
 W: http://helllabs.org/~claudio
-D: V4L, OV511 and HDA-codec hacks
+D: V4L, OV511 driver hacks
 S: Conectiva S.A.
-S: Souza Naves 1250
-S: 80050-040  Curitiba PR
+S: R. Tocantins 89
+S: 80050-430  Curitiba PR
 S: Brazil
 
 N: Heinz Mauelshagen
@@ -3301,6 +3301,14 @@ S: 12725 SW Millikan Way, Suite 400
 S: Beaverton, Oregon 97005
 S: USA
 
+N: Li Yang
+E: leoli@freescale.com
+D: Freescale Highspeed USB device driver
+D: Freescale QE SoC support and Ethernet driver
+S: B-1206 Jingmao Guojigongyu
+S: 16 Baliqiao Nanjie, Beijing 101100
+S: People's Repulic of China
+
 N: Marcelo Tosatti
 E: marcelo@kvack.org
 D: v2.4 kernel maintainer
@@ -3718,14 +3726,6 @@ S: 542 West 112th Street, 5N
 S: New York, New York 10025
 S: USA
 
-N: Li Yang
-E: leoli@freescale.com
-D: Freescale Highspeed USB device driver
-D: Freescale QE SoC support and Ethernet driver
-S: B-1206 Jingmao Guojigongyu
-S: 16 Baliqiao Nanjie, Beijing 101100
-S: People's Repulic of China
-
 N: Victor Yodaiken
 E: yodaiken@fsmlabs.com
 D: RTLinux (RealTime Linux)