Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (130 commits)
  [ARM] 3856/1: Add clocksource for Intel IXP4xx platforms
  [ARM] 3855/1: Add generic time support
  [ARM] 3873/1: S3C24XX: Add irq_chip names
  [ARM] 3872/1: S3C24XX: Apply consistant tabbing to irq_chips
  [ARM] 3871/1: S3C24XX: Fix ordering of EINT4..23
  [ARM] nommu: confirms the CR_V bit in nommu mode
  [ARM] nommu: abort handler fixup for !CPU_CP15_MMU cores.
  [ARM] 3870/1: AT91: Start removing static memory mappings
  [ARM] 3869/1: AT91: NAND support for DK and KB9202 boards
  [ARM] 3868/1: AT91 hardware header update
  [ARM] 3867/1: AT91 GPIO update
  [ARM] 3866/1: AT91 clock update
  [ARM] 3865/1: AT91RM9200 header updates
  [ARM] 3862/2: S3C2410 - add basic power management support for AML M5900 series
  [ARM] kthread: switch arch/arm/kernel/apm.c
  [ARM] Off-by-one in arch/arm/common/icst*
  [ARM] 3864/1: Refactore sharpsl_pm
  [ARM] 3863/1: Add Locomo SPI Device
  [ARM] 3847/2:  Convert LOMOMO to use struct device for GPIOs
  [ARM] Use CPU_CACHE_* where possible in asm/cacheflush.h
  ...

1 files changed, 69 insertions, 5 deletions

diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
index e1372a25311d..b02af1d740fa 100644
--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
@@ -12,7 +12,7 @@
 #
 #   http://www.arm.linux.org.uk/developer/machines/?action=new
 #
-# Last update: Mon Jun 26 22:26:08 2006
+# Last update: Sat Sep 23 13:20:43 2006
 #
 # machine_is_xxx        CONFIG_xxxx             MACH_TYPE_xxx           number
 #
@@ -329,7 +329,7 @@ nimbra29x		ARCH_NIMBRA29X		NIMBRA29X		311
 nimbra210               ARCH_NIMBRA210          NIMBRA210               312
 hhp_d95xx               ARCH_HHP_D95XX          HHP_D95XX               313
 labarm                  ARCH_LABARM             LABARM                  314
-comcerto                ARCH_M825XX             M825XX                  315
+m825xx                  ARCH_M825XX             M825XX                  315
 m7100                   SA1100_M7100            M7100                   316
 nipc2                   ARCH_NIPC2              NIPC2                   317
 fu7202                  ARCH_FU7202             FU7202                  318
@@ -857,12 +857,12 @@ osiris			MACH_OSIRIS		OSIRIS			842
 maestro                 MACH_MAESTRO            MAESTRO                 843
 tunge2                  MACH_TUNGE2             TUNGE2                  844
 ixbbm                   MACH_IXBBM              IXBBM                   845
-mx27ads                 MACH_MX27               MX27                    846
+mx27ads                 MACH_MX27ADS            MX27ADS                 846
 ax8004                  MACH_AX8004             AX8004                  847
 at91sam9261ek           MACH_AT91SAM9261EK      AT91SAM9261EK           848
 loft                    MACH_LOFT               LOFT                    849
 magpie                  MACH_MAGPIE             MAGPIE                  850
-mx21ads                 MACH_MX21               MX21                    851
+mx21ads                 MACH_MX21ADS            MX21ADS                 851
 mb87m3400               MACH_MB87M3400          MB87M3400               852
 mguard_delta            MACH_MGUARD_DELTA       MGUARD_DELTA            853
 davinci_dvdp            MACH_DAVINCI_DVDP       DAVINCI_DVDP            854
@@ -1058,7 +1058,7 @@ akai9307		MACH_AKAI9307		AKAI9307		1044
 fontaine                MACH_FONTAINE           FONTAINE                1045
 wombat                  MACH_WOMBAT             WOMBAT                  1046
 acq300                  MACH_ACQ300             ACQ300                  1047
-mod_270                 MACH_MOD_270            MOD_270                 1048
+mod272                  MACH_MOD_270            MOD_270                 1048
 vmc_vc0820              MACH_VC0820             VC0820                  1049
 ani_aim                 MACH_ANI_AIM            ANI_AIM                 1050
 jellyfish               MACH_JELLYFISH          JELLYFISH               1051
@@ -1093,3 +1093,67 @@ msm6100			MACH_MSM6100		MSM6100			1079
 eti_b1                  MACH_ETI_B1             ETI_B1                  1080
 za9l_series             MACH_ZILOG_ZA9L         ZILOG_ZA9L              1081
 bit2440                 MACH_BIT2440            BIT2440                 1082
+nbi                     MACH_NBI                NBI                     1083
+smdk2443                MACH_SMDK2443           SMDK2443                1084
+vdavinci                MACH_VDAVINCI           VDAVINCI                1085
+atc6                    MACH_ATC6               ATC6                    1086
+multmdw                 MACH_MULTMDW            MULTMDW                 1087
+mba2440                 MACH_MBA2440            MBA2440                 1088
+ecsd                    MACH_ECSD               ECSD                    1089
+zire31                  MACH_ZIRE31             ZIRE31                  1090
+fsg                     MACH_FSG                FSG                     1091
+razor101                MACH_RAZOR101           RAZOR101                1092
+opera_tdm               MACH_OPERA_TDM          OPERA_TDM               1093
+comcerto                MACH_COMCERTO           COMCERTO                1094
+tb0319                  MACH_TB0319             TB0319                  1095
+kws8000                 MACH_KWS8000            KWS8000                 1096
+b2                      MACH_B2                 B2                      1097
+lcl54                   MACH_LCL54              LCL54                   1098
+at91sam9260ek           MACH_AT91SAM9260EK      AT91SAM9260EK           1099
+glantank                MACH_GLANTANK           GLANTANK                1100
+n2100                   MACH_N2100              N2100                   1101
+n4100                   MACH_N4100              N4100                   1102
+rsc4                    MACH_VERTICAL_RSC4      VERTICAL_RSC4           1103
+sg8100                  MACH_SG8100             SG8100                  1104
+im42xx                  MACH_IM42XX             IM42XX                  1105
+ftxx                    MACH_FTXX               FTXX                    1106
+lwfusion                MACH_LWFUSION           LWFUSION                1107
+qt2410                  MACH_QT2410             QT2410                  1108
+kixrp435                MACH_KIXRP435           KIXRP435                1109
+ccw9c                   MACH_CCW9C              CCW9C                   1110
+dabhs                   MACH_DABHS              DABHS                   1111
+gzmx                    MACH_GZMX               GZMX                    1112
+ipnw100ap               MACH_IPNW100AP          IPNW100AP               1113
+cc9p9360dev             MACH_CC9P9360DEV        CC9P9360DEV             1114
+cc9p9750dev             MACH_CC9P9750DEV        CC9P9750DEV             1115
+cc9p9360val             MACH_CC9P9360VAL        CC9P9360VAL             1116
+cc9p9750val             MACH_CC9P9750VAL        CC9P9750VAL             1117
+nx70v                   MACH_NX70V              NX70V                   1118
+at91rm9200df            MACH_AT91RM9200DF       AT91RM9200DF            1119
+se_pilot2               MACH_SE_PILOT2          SE_PILOT2               1120
+mtcn_t800               MACH_MTCN_T800          MTCN_T800               1121
+vcmx212                 MACH_VCMX212            VCMX212                 1122
+lynx                    MACH_LYNX               LYNX                    1123
+at91sam9260id           MACH_AT91SAM9260ID      AT91SAM9260ID           1124
+hw86052                 MACH_HW86052            HW86052                 1125
+pilz_pmi3               MACH_PILZ_PMI3          PILZ_PMI3               1126
+edb9302a                MACH_EDB9302A           EDB9302A                1127
+edb9307a                MACH_EDB9307A           EDB9307A                1128
+ct_dfs                  MACH_CT_DFS             CT_DFS                  1129
+pilz_pmi4               MACH_PILZ_PMI4          PILZ_PMI4               1130
+xceednp_ixp             MACH_XCEEDNP_IXP        XCEEDNP_IXP             1131
+smdk2442b               MACH_SMDK2442B          SMDK2442B               1132
+xnode                   MACH_XNODE              XNODE                   1133
+aidx270                 MACH_AIDX270            AIDX270                 1134
+rema                    MACH_REMA               REMA                    1135
+bps1000                 MACH_BPS1000            BPS1000                 1136
+hw90350                 MACH_HW90350            HW90350                 1137
+omap_sdp3430            MACH_OMAP_SDP3430       OMAP_SDP3430            1138
+bluetouch               MACH_BLUETOUCH          BLUETOUCH               1139
+vstms                   MACH_VSTMS              VSTMS                   1140
+xsbase270               MACH_XSBASE270          XSBASE270               1141
+at91sam9260ek_cn        MACH_AT91SAM9260EK_CN   AT91SAM9260EK_CN        1142
+adsturboxb              MACH_ADSTURBOXB         ADSTURBOXB              1143
+oti4110                 MACH_OTI4110            OTI4110                 1144
+hme_pxa                 MACH_HME_PXA            HME_PXA                 1145
+deisterdca              MACH_DEISTERDCA         DEISTERDCA              1146