---

yaml --- r: 57972 b: refs/heads/master c: e7c746e h: refs/heads/master v: v3
git-mirror · Jun 18, 2007 · 4f4d8c3 · 4f4d8c3
1 parent 09ba897
commit 4f4d8c3
Show file tree

Hide file tree

Showing 133 changed files with 1,326 additions and 1,585 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: af6f2b2b5ce478d77a34497f9058bc65093c761a
+refs/heads/master: e7c746ef098770f863ba294adac5b30d124ba469
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -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)

diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -4022,11 +4022,11 @@ S:	Supported
 
 XFS FILESYSTEM
 P:	Silicon Graphics Inc
-P:	Tim Shimmin
+P:	Tim Shimmin, David Chatterton
 M:	xfs-masters@oss.sgi.com
 L:	xfs@oss.sgi.com
 W:	http://oss.sgi.com/projects/xfs
-T:	git git://oss.sgi.com:8090/xfs/xfs-2.6.git
+T:	git git://oss.sgi.com:8090/xfs/xfs-2.6
 S:	Supported
 
 XILINX UARTLITE SERIAL DRIVER

diff --git a/trunk/arch/avr32/boards/atngw100/setup.c b/trunk/arch/avr32/boards/atngw100/setup.c
@@ -94,6 +94,9 @@ static void __init set_hw_addr(struct platform_device *pdev)
 	clk_put(pclk);
 }
 
+struct platform_device *at32_usart_map[1];
+unsigned int at32_nr_usarts = 1;
+
 void __init setup_board(void)
 {
 	at32_map_usart(1, 0);	/* USART 1: /dev/ttyS0, DB9 */