summaryrefslogtreecommitdiffstats
path: root/Documentation/arm/SA1100/Brutus
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2009-09-22 21:54:53 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-09-22 22:01:40 +0200
commitae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch)
tree3c2086ab67398a019089a47ca3f362a4bc6db74f /Documentation/arm/SA1100/Brutus
parentARM: 5721/1: MMCI enable the use of a regulator (diff)
parentARM: 5719/1: [AT91] Fix AC97 breakage (diff)
downloadlinux-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz
linux-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.zip
Merge branch 'master' into for-linus
Diffstat (limited to 'Documentation/arm/SA1100/Brutus')
-rw-r--r--Documentation/arm/SA1100/Brutus2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/SA1100/Brutus b/Documentation/arm/SA1100/Brutus
index 2254c8f0b326..b1cfd405dccc 100644
--- a/Documentation/arm/SA1100/Brutus
+++ b/Documentation/arm/SA1100/Brutus
@@ -60,7 +60,7 @@ little modifications.
Any contribution is welcome.
-Please send patches to nico@cam.org
+Please send patches to nico@fluxnic.net
Have Fun !