diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 08:55:36 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-09-20 08:55:36 -0400 |
| commit | 6469f540ea37d53db089c8fea9c0c77a3d9353d4 (patch) | |
| tree | 1dc9dc077150d57f4424cae49e711b5dd6e903a1 /Documentation/arm/SA1100/Brutus | |
| parent | 304e6d5fe294b80e6d3107f99ec241816390ebcc (diff) | |
| parent | 78f28b7c555359c67c2a0d23f7436e915329421e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Merged in order that I can apply the Nomadik nand/onenand support patches.
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 | ||