diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/serial/s3c24a0.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/serial/s3c24a0.c')
| -rw-r--r-- | drivers/serial/s3c24a0.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |