Merge branch 'devel-stable' into devel

author: Russell King <rmk+kernel@arm.linux.org.uk> 2009-12-05 05:35:33 -0500
committer: Russell King <rmk+kernel@arm.linux.org.uk> 2009-12-05 05:35:33 -0500
commit: 0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch)
tree: 794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /drivers/serial
parent: e28edb723e64200554194da17617ee6e82de6690 (diff)
parent: 677f4f64e4b2336682f0e15c69b206ade6f6b131 (diff)
6 files changed, 6 insertions, 6 deletions
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c
index c99f0821cae3..73f089d3efd6 100644
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -2,7 +2,7 @@
 *
 * Driver for Samsung S3C2410 SoC onboard UARTs.
 *
- * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
 *      http://armlinux.simtec.co.uk/
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/serial/s3c2412.c b/drivers/serial/s3c2412.c
index 6e057d8809d3..ce75e28e36ef 100644
--- a/drivers/serial/s3c2412.c
+++ b/drivers/serial/s3c2412.c
@@ -2,7 +2,7 @@
 *
 * Driver for Samsung S3C2412 and S3C2413 SoC onboard UARTs.
 *
- * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
 *      http://armlinux.simtec.co.uk/
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c
index 69ff5d340f04..094cc3904b13 100644
--- a/drivers/serial/s3c2440.c
+++ b/drivers/serial/s3c2440.c
@@ -2,7 +2,7 @@
 *
 * Driver for Samsung S3C2440 and S3C2442 SoC onboard UARTs.
 *
- * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
 *      http://armlinux.simtec.co.uk/
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/serial/s3c24a0.c b/drivers/serial/s3c24a0.c
index 26c49e18bdd1..fad6083ca427 100644
--- a/drivers/serial/s3c24a0.c
+++ b/drivers/serial/s3c24a0.c
@@ -6,7 +6,7 @@
 *
 * Author: Sandeep Patil <sandeep.patil@azingo.com>
 *
- * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
 *      http://armlinux.simtec.co.uk/
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c
index 1523e8d9ae77..52e3df113ec0 100644
--- a/drivers/serial/samsung.c
+++ b/drivers/serial/samsung.c
@@ -2,7 +2,7 @@
 *
 * Driver core for Samsung SoC onboard UARTs.
 *
- * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
 *      http://armlinux.simtec.co.uk/
 *
 * This program is free software; you can redistribute it and/or modify
diff --git a/drivers/serial/samsung.h b/drivers/serial/samsung.h
index d3fe315969f6..1fb22343df42 100644
--- a/drivers/serial/samsung.h
+++ b/drivers/serial/samsung.h
@@ -2,7 +2,7 @@
 *
 * Driver for Samsung SoC onboard UARTs.
 *
- * Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics
+ * Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
 *      http://armlinux.simtec.co.uk/
 *
 * This program is free software; you can redistribute it and/or modify
author	Russell King <rmk+kernel@arm.linux.org.uk>	2009-12-05 05:35:33 -0500
committer	Russell King <rmk+kernel@arm.linux.org.uk>	2009-12-05 05:35:33 -0500
commit	0719dc341389882cc834ed18fc9b7fc6006b2b85 (patch)
tree	794480ac62c07ea8cc4e69c2cb3d2b83bb7f36b7 /drivers/serial
parent	e28edb723e64200554194da17617ee6e82de6690 (diff)
parent	677f4f64e4b2336682f0e15c69b206ade6f6b131 (diff)

diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index c99f0821cae3..73f089d3efd6 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c
@@ -2,7 +2,7 @@
2	*	2	*
3	* Driver for Samsung S3C2410 SoC onboard UARTs.	3	* Driver for Samsung S3C2410 SoC onboard UARTs.
4	*	4	*
5	* Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics	5	* Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
6	* http://armlinux.simtec.co.uk/	6	* http://armlinux.simtec.co.uk/
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify


diff --git a/drivers/serial/s3c2412.c b/drivers/serial/s3c2412.c index 6e057d8809d3..ce75e28e36ef 100644 --- a/drivers/serial/s3c2412.c +++ b/drivers/serial/s3c2412.c
@@ -2,7 +2,7 @@
2	*	2	*
3	* Driver for Samsung S3C2412 and S3C2413 SoC onboard UARTs.	3	* Driver for Samsung S3C2412 and S3C2413 SoC onboard UARTs.
4	*	4	*
5	* Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics	5	* Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
6	* http://armlinux.simtec.co.uk/	6	* http://armlinux.simtec.co.uk/
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify


diff --git a/drivers/serial/s3c2440.c b/drivers/serial/s3c2440.c index 69ff5d340f04..094cc3904b13 100644 --- a/drivers/serial/s3c2440.c +++ b/drivers/serial/s3c2440.c
@@ -2,7 +2,7 @@
2	*	2	*
3	* Driver for Samsung S3C2440 and S3C2442 SoC onboard UARTs.	3	* Driver for Samsung S3C2440 and S3C2442 SoC onboard UARTs.
4	*	4	*
5	* Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics	5	* Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
6	* http://armlinux.simtec.co.uk/	6	* http://armlinux.simtec.co.uk/
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify


diff --git a/drivers/serial/s3c24a0.c b/drivers/serial/s3c24a0.c index 26c49e18bdd1..fad6083ca427 100644 --- a/drivers/serial/s3c24a0.c +++ b/drivers/serial/s3c24a0.c
@@ -6,7 +6,7 @@
6	*	6	*
7	* Author: Sandeep Patil <sandeep.patil@azingo.com>	7	* Author: Sandeep Patil <sandeep.patil@azingo.com>
8	*	8	*
9	* Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics	9	* Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
10	* http://armlinux.simtec.co.uk/	10	* http://armlinux.simtec.co.uk/
11	*	11	*
12	* This program is free software; you can redistribute it and/or modify	12	* This program is free software; you can redistribute it and/or modify


diff --git a/drivers/serial/samsung.c b/drivers/serial/samsung.c index 1523e8d9ae77..52e3df113ec0 100644 --- a/drivers/serial/samsung.c +++ b/drivers/serial/samsung.c
@@ -2,7 +2,7 @@
2	*	2	*
3	* Driver core for Samsung SoC onboard UARTs.	3	* Driver core for Samsung SoC onboard UARTs.
4	*	4	*
5	* Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics	5	* Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
6	* http://armlinux.simtec.co.uk/	6	* http://armlinux.simtec.co.uk/
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify


diff --git a/drivers/serial/samsung.h b/drivers/serial/samsung.h index d3fe315969f6..1fb22343df42 100644 --- a/drivers/serial/samsung.h +++ b/drivers/serial/samsung.h
@@ -2,7 +2,7 @@
2	*	2	*
3	* Driver for Samsung SoC onboard UARTs.	3	* Driver for Samsung SoC onboard UARTs.
4	*	4	*
5	* Ben Dooks, Copyright (c) 2003-2005,2008 Simtec Electronics	5	* Ben Dooks, Copyright (c) 2003-2008 Simtec Electronics
6	* http://armlinux.simtec.co.uk/	6	* http://armlinux.simtec.co.uk/
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify