Merge branches 'master' and 'devel' into for-linus

Conflicts:
	arch/arm/Kconfig
	arch/arm/mm/Kconfig

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
index 05fc7cf6711dc4d5a989b6080bfb5dbd02014c39,37a36457bb38f81e823ca2d3b790af08e88f6901..92951103255a1dff3e30d237a676f8d8bfa137e3
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1120,11 -1122,11 +1144,11 @@@ config SM
        bool "Symmetric Multi-Processing (EXPERIMENTAL)"
        depends on EXPERIMENTAL && (REALVIEW_EB_ARM11MP || REALVIEW_EB_A9MP ||\
                 MACH_REALVIEW_PB11MP || MACH_REALVIEW_PBX || ARCH_OMAP4 ||\
-                ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
 -               ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_S5PV310)
++               ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
        depends on GENERIC_CLOCKEVENTS
        select USE_GENERIC_SMP_HELPERS
-       select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || \
-                ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
 -      select HAVE_ARM_SCU if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 ||\
 -                      ARCH_S5PV310)
++      select HAVE_ARM_SCU if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 ||\
++               ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4
        help
          This enables support for systems with more than one CPU. If you have
          a system with only one CPU, like most personal computers, say N. If
@@@ -1194,10 -1196,9 +1218,10 @@@ config LOCAL_TIMER
        bool "Use local timer interrupts"
        depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || \
                REALVIEW_EB_A9MP || MACH_REALVIEW_PBX || ARCH_OMAP4 || \
-               ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_TEGRA)
 -              ARCH_S5PV310 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
 -      select HAVE_ARM_TWD if (ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \
 -              ARCH_U8500 || ARCH_VEXPRESS)
++              ARCH_S5PV310 || ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS_CA9X4)
 +      default y
-       select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_VEXPRESS || ARCH_OMAP4 || \\
-               ARCH_U8500 || ARCH_TEGRA
++      select HAVE_ARM_TWD if ARCH_REALVIEW || ARCH_OMAP4 || ARCH_S5PV310 || \
++              ARCH_TEGRA || ARCH_U8500 || ARCH_VEXPRESS
        help
          Enable support for local timers on SMP platforms, rather then the
          legacy IPI broadcast method.  Local timers allows the system

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mm/Kconfig
index e1fd98fff8fac03c58282841191b8e7cff03e807,d6ffcee4316efa36a3cce326b093e5a871bfaade..33c3f570aaa06c2a56f6a6d70eb7f558a883b0b1
--- 1/arch/arm/mm/Kconfig
--- 2/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -771,8 -771,8 +771,8 @@@ config CACHE_L2X
        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 || ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || \
-                  ARCH_TEGRA
 -                 ARCH_S5PV310
++                 ARCH_NOMADIK || ARCH_OMAP4 || ARCH_S5PV310 || ARCH_TEGRA || \
++                 ARCH_U8500 || ARCH_VEXPRESS_CA9X4
        default y
        select OUTER_CACHE
        select OUTER_CACHE_SYNC

diff --cc drivers/ata/Kconfig
Simple merge

diff --cc drivers/ata/Makefile
index 6540632bda082d51ca656ae25b36641848c07814,e87d644b8ed27504178fd004e7ccf1d79238f1b0..158eaa961b1e6f0d247f78691b8f4b309a9d6622
--- 1/drivers/ata/Makefile
--- 2/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@@ -88,9 -87,10 +88,11 @@@ obj-$(CONFIG_PATA_OF_PLATFORM)      += pata_
  obj-$(CONFIG_PATA_QDI)                += pata_qdi.o
  obj-$(CONFIG_PATA_RB532)      += pata_rb532_cf.o
  obj-$(CONFIG_PATA_RZ1000)     += pata_rz1000.o
 +obj-$(CONFIG_PATA_SAMSUNG_CF) += pata_samsung_cf.o
  obj-$(CONFIG_PATA_WINBOND_VLB)        += pata_winbond.o
  
+ obj-$(CONFIG_PATA_PXA)                += pata_pxa.o
+ 
  # Should be last but two libata driver
  obj-$(CONFIG_PATA_ACPI)               += pata_acpi.o
  # Should be last but one libata driver

diff --cc drivers/dma/Kconfig
Simple merge

diff --cc drivers/pcmcia/Makefile
Simple merge

diff --cc drivers/video/Kconfig
Simple merge