diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 21:54:53 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 22:01:40 +0200 |
commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /Documentation/arm/SA1100/GraphicsMaster | |
parent | ARM: 5721/1: MMCI enable the use of a regulator (diff) | |
parent | ARM: 5719/1: [AT91] Fix AC97 breakage (diff) | |
download | linux-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz linux-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.zip |
Merge branch 'master' into for-linus
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! |