Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa...

Conflicts:
	arch/arm/Makefile
	arch/arm/common/Makefile
	arch/arm/mm/Kconfig

diff --cc arch/arm/Kconfig
index c5408bf1bf43321e49f525ada25456b538f97f78,c5408bf1bf43321e49f525ada25456b538f97f78,c5408bf1bf43321e49f525ada25456b538f97f78,c5408bf1bf43321e49f525ada25456b538f97f78,88f9334110cf77631976a60f5dd884b2bd304edd,540f85922113582bba142b19c3aace3df0998c9d,c5408bf1bf43321e49f525ada25456b538f97f78,c5408bf1bf43321e49f525ada25456b538f97f78,1459231bcbb385b70a21743e5eb8efc564347c1c,4bb7730a26828216052b14ebfa8de801af569b34..daaa4b2b46e186ac82c15daa23864593f92ffd9b
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
--- 4/arch/arm/Kconfig
--- 5/arch/arm/Kconfig
--- 6/arch/arm/Kconfig
--- 7/arch/arm/Kconfig
--- 8/arch/arm/Kconfig
--- 9/arch/arm/Kconfig
--- 10/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@@@@@@@@ -238,18 -238,18 -238,18 -238,18 -245,16 -238,18 -238,18 -238,18 -238,18 -238,21 +245,19 @@@@@@@@@@@ config ARCH_INTEGRATO
                bool "ARM Ltd. Integrator family"
                select ARM_AMBA
                select ARCH_HAS_CPUFREQ
---- -----      select HAVE_CLK
                select COMMON_CLKDEV
---------       select ICST525
+++++++++       select ICST
+++++++++       select GENERIC_TIME
+++++++++       select GENERIC_CLOCKEVENTS
+++++++++       select PLAT_VERSATILE
                help
                  Support for ARM's Integrator platform.
          
          config ARCH_REALVIEW
                bool "ARM Ltd. RealView family"
                select ARM_AMBA
---- -----      select HAVE_CLK
                select COMMON_CLKDEV
---------       select ICST307
+++++++++       select ICST
                select GENERIC_TIME
                select GENERIC_CLOCKEVENTS
                select ARCH_WANT_OPTIONAL_GPIOLIB
@@@@@@@@@@@ -260,9 -260,9 -260,9 -260,9 -265,8 -260,9 -260,9 -260,9 -260,9 -265,9 +270,8 @@@@@@@@@@@ config ARCH_VERSATIL
                bool "ARM Ltd. Versatile family"
                select ARM_AMBA
                select ARM_VIC
---- -----      select HAVE_CLK
                select COMMON_CLKDEV
---------       select ICST307
+++++++++       select ICST
                select GENERIC_TIME
                select GENERIC_CLOCKEVENTS
                select ARCH_WANT_OPTIONAL_GPIOLIB

diff --cc arch/arm/Makefile
index ed820e737a8a66fd063192b685b5642ea2f71985,ed820e737a8a66fd063192b685b5642ea2f71985,ed820e737a8a66fd063192b685b5642ea2f71985,ed820e737a8a66fd063192b685b5642ea2f71985,ed820e737a8a66fd063192b685b5642ea2f71985,ed820e737a8a66fd063192b685b5642ea2f71985,ed820e737a8a66fd063192b685b5642ea2f71985,ed820e737a8a66fd063192b685b5642ea2f71985,b3a3518a36fd2b8fe646ad389c13df4adcf2ed57,67c92efa3112c8717166bb6f0149c136478a7c4b..219cb4ee7e3292ae7734d53cf99326fd51459301
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
--- 3/arch/arm/Makefile
--- 4/arch/arm/Makefile
--- 5/arch/arm/Makefile
--- 6/arch/arm/Makefile
--- 7/arch/arm/Makefile
--- 8/arch/arm/Makefile
--- 9/arch/arm/Makefile
--- 10/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@@@@@@@@@ -192,6 -192,6 -192,6 -192,6 -192,6 -192,6 -192,6 -192,6 -196,7 -193,7 +197,8 @@@@@@@@@@@ plat-$(CONFIG_PLAT_PXA)            := px
          plat-$(CONFIG_PLAT_S3C24XX)   := s3c24xx samsung
          plat-$(CONFIG_PLAT_S5PC1XX)   := s5pc1xx samsung
          plat-$(CONFIG_PLAT_S5P)               := s5p samsung
++++++++ +plat-$(CONFIG_PLAT_SPEAR)     := spear
+++++++++ plat-$(CONFIG_PLAT_VERSATILE) := versatile
          
          ifeq ($(CONFIG_ARCH_EBSA110),y)
          # This is what happens if you forget the IOCS16 line.

diff --cc arch/arm/common/Kconfig
index 4efbb9df0444c6aaa249090b48e6ff7e56d9e259,4efbb9df0444c6aaa249090b48e6ff7e56d9e259,4efbb9df0444c6aaa249090b48e6ff7e56d9e259,4efbb9df0444c6aaa249090b48e6ff7e56d9e259,cf9059091884c3a5575e09ad1bb42212c6d8970a,4efbb9df0444c6aaa249090b48e6ff7e56d9e259,4efbb9df0444c6aaa249090b48e6ff7e56d9e259,4efbb9df0444c6aaa249090b48e6ff7e56d9e259,4efbb9df0444c6aaa249090b48e6ff7e56d9e259,323d2d2895235cba2167cd5fb3c25a3c673fc631..0a34c8186924415398601d46d488a2b011136219
--- 1/arch/arm/common/Kconfig
--- 2/arch/arm/common/Kconfig
--- 3/arch/arm/common/Kconfig
--- 4/arch/arm/common/Kconfig
--- 5/arch/arm/common/Kconfig
--- 6/arch/arm/common/Kconfig
--- 7/arch/arm/common/Kconfig
--- 8/arch/arm/common/Kconfig
--- 9/arch/arm/common/Kconfig
--- 10/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@@@@@@@@@@ -12,12 -12,12 -12,12 -12,12 -12,15 -12,12 -12,12 -12,12 -12,12 -12,9 +12,12 @@@@@@@@@@@ config ARM_VIC_N
                  The maximum number of VICs available in the system, for
                  power management.
          
--------- config ICST525
    -           bool
    -     
    -     config ICST307
+++++++++ config ICST
                bool
          
---- ---- config ICST307
++++ +++++config PL330
         +      bool
         +
          config SA1111
                bool
                select DMABOUNCE if !ARCH_PXA

diff --cc arch/arm/common/Makefile
index 76be7ff2a7ca37a55814071da882c0e374a39475,76be7ff2a7ca37a55814071da882c0e374a39475,76be7ff2a7ca37a55814071da882c0e374a39475,76be7ff2a7ca37a55814071da882c0e374a39475,df20c265020660acaaf55e053740adc12a2ec86c,76be7ff2a7ca37a55814071da882c0e374a39475,76be7ff2a7ca37a55814071da882c0e374a39475,76be7ff2a7ca37a55814071da882c0e374a39475,76be7ff2a7ca37a55814071da882c0e374a39475,5e8ad0d6c917bb1105e43a176d19ab6405ac527c..e6e8664a94139cd7e4086020d537ded4ca087f9e
--- 1/arch/arm/common/Makefile
--- 2/arch/arm/common/Makefile
--- 3/arch/arm/common/Makefile
--- 4/arch/arm/common/Makefile
--- 5/arch/arm/common/Makefile
--- 6/arch/arm/common/Makefile
--- 7/arch/arm/common/Makefile
--- 8/arch/arm/common/Makefile
--- 9/arch/arm/common/Makefile
--- 10/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@@@@@@@@@@ -4,8 -4,8 -4,8 -4,8 -4,9 -4,8 -4,8 -4,8 -4,8 -4,7 +4,8 @@@@@@@@@@@
          
          obj-$(CONFIG_ARM_GIC)         += gic.o
          obj-$(CONFIG_ARM_VIC)         += vic.o
--------- obj-$(CONFIG_ICST525)         += icst525.o
--------- obj-$(CONFIG_ICST307)         += icst307.o
+++++++++ obj-$(CONFIG_ICST)            += icst.o
++++ +++++obj-$(CONFIG_PL330)           += pl330.o
          obj-$(CONFIG_SA1111)          += sa1111.o
          obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
          obj-$(CONFIG_DMABOUNCE)               += dmabounce.o

diff --cc arch/arm/mach-at91/Kconfig
Simple merge

diff --cc arch/arm/mm/Kconfig
index c4ed9f93f646be93fbdcc048a326c5d7db995bcd,c4ed9f93f646be93fbdcc048a326c5d7db995bcd,c4ed9f93f646be93fbdcc048a326c5d7db995bcd,c4ed9f93f646be93fbdcc048a326c5d7db995bcd,573528d9c6d81b01000771e4af605f7042cb2292,22c1c839306a7f6ea566d1258df0440898cd3c17,c4ed9f93f646be93fbdcc048a326c5d7db995bcd,c4ed9f93f646be93fbdcc048a326c5d7db995bcd,c4ed9f93f646be93fbdcc048a326c5d7db995bcd,270c8e2a4490d93fe185bc759b6c889b43f21397..33027301639ebf840f5344a3d42c4be1a416bd63
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
--- 3/arch/arm/mm/Kconfig
--- 4/arch/arm/mm/Kconfig
--- 5/arch/arm/mm/Kconfig
--- 6/arch/arm/mm/Kconfig
--- 7/arch/arm/mm/Kconfig
--- 8/arch/arm/mm/Kconfig
--- 9/arch/arm/mm/Kconfig
--- 10/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@@@@@@@@@ -754,7 -754,7 -754,7 -754,7 -754,7 -754,8 -754,7 -754,7 -754,7 -754,8 +754,8 @@@@@@@@@@@ config CACHE_FEROCEON_L2_WRITETHROUG
          config CACHE_L2X0
                bool "Enable the L2x0 outer cache controller"
                depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
----- ---                  REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || ARCH_NOMADIK || ARCH_OMAP4
+++++ +++                  REALVIEW_EB_A9MP || ARCH_MX35 || ARCH_MX31 || MACH_REALVIEW_PBX || \
     -                     ARCH_NOMADIK || ARCH_OMAP4 || ARCH_U8500
         -                 ARCH_NOMADIK || ARCH_OMAP4 || ARCH_VEXPRESS_CA9X4
++++++++++                 ARCH_NOMADIK || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4
                default y
                select OUTER_CACHE
                help