diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/video/epson1355fb.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/video/epson1355fb.c')
| -rw-r--r-- | drivers/video/epson1355fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c index db9713b49ce9..a268cbf1cbea 100644 --- a/drivers/video/epson1355fb.c +++ b/drivers/video/epson1355fb.c | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | * Epson Research S1D13505 Embedded RAMDAC LCD/CRT Controller | 4 | * Epson Research S1D13505 Embedded RAMDAC LCD/CRT Controller |
| 5 | * (previously known as SED1355) | 5 | * (previously known as SED1355) |
| 6 | * | 6 | * |
| 7 | * Cf. http://www.erd.epson.com/vdc/html/S1D13505.html | 7 | * Cf. http://vdc.epson.com/ |
| 8 | * | 8 | * |
| 9 | * | 9 | * |
| 10 | * Copyright (C) Hewlett-Packard Company. All rights reserved. | 10 | * Copyright (C) Hewlett-Packard Company. All rights reserved. |