diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:35:23 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:37:32 -0400 |
| commit | 365d46dc9be9b3c833990a06f3994b1987eda578 (patch) | |
| tree | 9397d1304144a288411f2118707f44ff5e862fa6 /arch/arm/mach-at91/include/mach/at91sam9_smc.h | |
| parent | 5dc64a3442b98eaa0e3730c35fcf00cf962a93e7 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/xen
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/process_64.c
arch/x86/xen/enlighten.c
Diffstat (limited to 'arch/arm/mach-at91/include/mach/at91sam9_smc.h')
| -rw-r--r-- | arch/arm/mach-at91/include/mach/at91sam9_smc.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-at91/include/mach/at91sam9_smc.h b/arch/arm/mach-at91/include/mach/at91sam9_smc.h index ec6ad1338b5a..57de6207e57e 100644 --- a/arch/arm/mach-at91/include/mach/at91sam9_smc.h +++ b/arch/arm/mach-at91/include/mach/at91sam9_smc.h | |||
| @@ -1,6 +1,9 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * arch/arm/mach-at91/include/mach/at91sam9_smc.h | 2 | * arch/arm/mach-at91/include/mach/at91sam9_smc.h |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 2007 Andrew Victor | ||
| 5 | * Copyright (C) 2007 Atmel Corporation. | ||
| 6 | * | ||
| 4 | * Static Memory Controllers (SMC) - System peripherals registers. | 7 | * Static Memory Controllers (SMC) - System peripherals registers. |
| 5 | * Based on AT91SAM9261 datasheet revision D. | 8 | * Based on AT91SAM9261 datasheet revision D. |
| 6 | * | 9 | * |