diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 06:48:32 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 06:48:32 +0200 |
| commit | ea88023b3491a384575ebcd5e8a449e841a28a24 (patch) | |
| tree | f46e3d8302e44dc55ce31823501e100472d29683 /Documentation/arm/SA1100/GraphicsMaster | |
| parent | video: sh_mobile_lcdcfb: use both register sets for display panning (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6 (diff) | |
| download | linux-ea88023b3491a384575ebcd5e8a449e841a28a24.tar.xz linux-ea88023b3491a384575ebcd5e8a449e841a28a24.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/vmlinux.lds.S
Diffstat (limited to 'Documentation/arm/SA1100/GraphicsMaster')
| -rw-r--r-- | Documentation/arm/SA1100/GraphicsMaster | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/arm/SA1100/GraphicsMaster b/Documentation/arm/SA1100/GraphicsMaster index dd28745ac521..ee7c6595f23f 100644 --- a/Documentation/arm/SA1100/GraphicsMaster +++ b/Documentation/arm/SA1100/GraphicsMaster @@ -4,7 +4,7 @@ For more details, contact Applied Data Systems or see http://www.applieddata.net/products.html The original Linux support for this product has been provided by -Nicolas Pitre <nico@cam.org>. Continued development work by +Nicolas Pitre <nico@fluxnic.net>. Continued development work by Woojung Huh <whuh@applieddata.net> Use 'make graphicsmaster_config' before any 'make config'. @@ -50,4 +50,4 @@ Notes: mode, the timing is off so the image is corrupted. This will be fixed soon. -Any contribution can be sent to nico@cam.org and will be greatly welcome! +Any contribution can be sent to nico@fluxnic.net and will be greatly welcome! |