diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 11:19:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 11:19:20 +0200 |
| commit | 8067794bec1cc5de1431102cf0a6a1c7ce75cd85 (patch) | |
| tree | 2bfa0fba060d253bbd972282b29a3d60c3e7cb7f /arch/sh/tools | |
| parent | 7ab6af7ab69df8c9c5fbc380004fb81187742096 (diff) | |
| parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) | |
| download | linux-8067794bec1cc5de1431102cf0a6a1c7ce75cd85.tar.gz linux-8067794bec1cc5de1431102cf0a6a1c7ce75cd85.tar.bz2 linux-8067794bec1cc5de1431102cf0a6a1c7ce75cd85.zip | |
Merge branch 'linus' into x86/x2apic
Conflicts:
arch/x86/kernel/genapic_64.c
Manual merge:
arch/x86/kernel/genx2apic_uv_x.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/tools')
| -rw-r--r-- | arch/sh/tools/mach-types | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sh/tools/mach-types b/arch/sh/tools/mach-types index 1bba7d36be90..0a11cc08f0a5 100644 --- a/arch/sh/tools/mach-types +++ b/arch/sh/tools/mach-types @@ -46,3 +46,7 @@ R2D_1 RTS7751R2D_1 CAYMAN SH_CAYMAN SDK7780 SH_SDK7780 MIGOR SH_MIGOR +RSK7203 SH_RSK7203 +AP325RXA SH_AP325RXA +SH7763RDP SH_SH7763RDP +SH7785LCR SH_SH7785LCR |