diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-17 14:52:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-17 14:53:10 -0400 |
| commit | 45bd00d31de886f8425b4dd33204b911b0a466a9 (patch) | |
| tree | 06204f2452e02ca916666173d50f5035d69065ef /Documentation/arm/SA1100/Assabet | |
| parent | 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01 (diff) | |
| parent | ab86e5765d41a5eb4239a1c04d613db87bea5ed8 (diff) | |
Merge branch 'linus' into tracing/core
Merge reason: Pick up kernel/softirq.c update for dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation/arm/SA1100/Assabet')
| -rw-r--r-- | Documentation/arm/SA1100/Assabet | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/arm/SA1100/Assabet b/Documentation/arm/SA1100/Assabet index 78bc1c1b04e5..91f7ce7ba426 100644 --- a/Documentation/arm/SA1100/Assabet +++ b/Documentation/arm/SA1100/Assabet | |||
| @@ -240,7 +240,7 @@ Then, rebooting the Assabet is just a matter of waiting for the login prompt. | |||
| 240 | 240 | ||
| 241 | 241 | ||
| 242 | Nicolas Pitre | 242 | Nicolas Pitre |
| 243 | nico@cam.org | 243 | nico@fluxnic.net |
| 244 | June 12, 2001 | 244 | June 12, 2001 |
| 245 | 245 | ||
| 246 | 246 | ||