diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-09-16 00:48:32 -0400 |
| commit | ea88023b3491a384575ebcd5e8a449e841a28a24 (patch) | |
| tree | f46e3d8302e44dc55ce31823501e100472d29683 /Documentation/arm/SA1100/Brutus | |
| parent | a6f15ade97989d414e9bf33874c9d5d1f39808ec (diff) | |
| parent | 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 (diff) | |
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/Brutus')
| -rw-r--r-- | Documentation/arm/SA1100/Brutus | 2 |
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. | |||
| 60 | 60 | ||
| 61 | Any contribution is welcome. | 61 | Any contribution is welcome. |
| 62 | 62 | ||
| 63 | Please send patches to nico@cam.org | 63 | Please send patches to nico@fluxnic.net |
| 64 | 64 | ||
| 65 | Have Fun ! | 65 | Have Fun ! |
| 66 | 66 | ||