diff options
author | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 15:49:01 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2008-11-03 15:49:01 +0100 |
commit | e856359685143a2f65876e7db4e4aa0ef5dce7f0 (patch) | |
tree | bbcafe7f23975979f7a2bc6fd1404908d5fd7bd1 /Documentation/DocBook/wanbook.tmpl | |
parent | [ARM] S3C24XX: Move mci.h to arch/arm/plat-s3c24xx/include/plat (diff) | |
parent | Linux v2.6.28-rc3 (diff) | |
download | linux-e856359685143a2f65876e7db4e4aa0ef5dce7f0.tar.xz linux-e856359685143a2f65876e7db4e4aa0ef5dce7f0.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c-moves2
Diffstat (limited to 'Documentation/DocBook/wanbook.tmpl')
-rw-r--r-- | Documentation/DocBook/wanbook.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/wanbook.tmpl b/Documentation/DocBook/wanbook.tmpl index 9eebcc304de4..8c93db122f04 100644 --- a/Documentation/DocBook/wanbook.tmpl +++ b/Documentation/DocBook/wanbook.tmpl @@ -12,7 +12,7 @@ <surname>Cox</surname> <affiliation> <address> - <email>alan@redhat.com</email> + <email>alan@lxorguk.ukuu.org.uk</email> </address> </affiliation> </author> |