diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /Documentation/DocBook/mcabook.tmpl | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
Diffstat (limited to 'Documentation/DocBook/mcabook.tmpl')
| -rw-r--r-- | Documentation/DocBook/mcabook.tmpl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/DocBook/mcabook.tmpl b/Documentation/DocBook/mcabook.tmpl index 499eddc2d079..467ccac6ec50 100644 --- a/Documentation/DocBook/mcabook.tmpl +++ b/Documentation/DocBook/mcabook.tmpl | |||
| @@ -12,7 +12,7 @@ | |||
| 12 | <surname>Cox</surname> | 12 | <surname>Cox</surname> |
| 13 | <affiliation> | 13 | <affiliation> |
| 14 | <address> | 14 | <address> |
| 15 | <email>alan@redhat.com</email> | 15 | <email>alan@lxorguk.ukuu.org.uk</email> |
| 16 | </address> | 16 | </address> |
| 17 | </affiliation> | 17 | </affiliation> |
| 18 | </author> | 18 | </author> |